diff --git a/XCAEA/Libraries/xcaea.signaller.lib.mq5 b/XCAEA/Libraries/xcaea.signaller.lib.mq5
index c17c6532..4afc6017 100644
--- a/XCAEA/Libraries/xcaea.signaller.lib.mq5
+++ b/XCAEA/Libraries/xcaea.signaller.lib.mq5
@@ -769,6 +769,13 @@ bool DetectXCAEAConditions(
     double pVIDYA = conditions.vidyaBuffer[pIDX];
     double p2VIDYA = conditions.vidyaBuffer[p2IDX];
 
+    //
+    // RSI ...
+    double zRSI = conditions.rsiBuffer[zIDX];
+    double cRSI = conditions.rsiBuffer[cIDX];
+    double pRSI = conditions.rsiBuffer[pIDX];
+    double p2RSI = conditions.rsiBuffer[p2IDX];
+
     //
     // X3MA ...
 
@@ -861,6 +868,19 @@ bool DetectXCAEAConditions(
     double pTrendValuesRange = (maxPTrendValue - minPTrendValue);
     double pTrendValuesRangePoint = (pTrendValuesRange / points);
 
+    //
+    // Create Conditions ...
+
+    //
+    bool isRSIBullish =
+        cRSI > pRSI &&
+        !conditions.isRSIOB;
+
+    //
+    bool isRSIBearish =
+        cRSI < pRSI &&
+        !conditions.isRSIOS;
+
     //
     bool isLowOverMax = cBar.low > maxCTrendValue;
     bool isHighUnderMin = cBar.high < minCTrendValue;
@@ -877,9 +897,6 @@ bool DetectXCAEAConditions(
     bool isTrendRangeFinishedFromValid = !isCTrendRangeValid &&
                                          isPTrendRangeValid;
 
-    //
-    // Create Conditions ...
-
     //
     bool isX3MaBullishState =
         //
@@ -1008,7 +1025,8 @@ bool DetectXCAEAConditions(
     //
     bool isCond1Bullish =
         //
-        false && // TODO: Remove this ...
+        // false && // TODO: Remove this ...
+        isRSIBullish &&
         isVolumeOverAvg &&
         isVolumeOverLast &&
         conditions.isSarBullish &&
@@ -1021,7 +1039,8 @@ bool DetectXCAEAConditions(
     //
     bool isCond1Bearish =
         //
-        false && // TODO: Remove this ...
+        // false && // TODO: Remove this ...
+        isRSIBearish &&
         isVolumeOverAvg &&
         isVolumeOverLast &&
         conditions.isSarBearish &&
@@ -1039,14 +1058,14 @@ bool DetectXCAEAConditions(
         //
         pivotBox = rejectedPivot;
 
-        //
-        drawer.DrawBox(
-            rejectedPivot,
-            TimeCurrent() //
-        );
+        // //
+        // drawer.DrawBox(
+        //     rejectedPivot,
+        //     TimeCurrent() //
+        // );
 
         //
-        Print("Cond1");
+        // Print("Cond1");
     }
 
     //
@@ -1055,7 +1074,7 @@ bool DetectXCAEAConditions(
     //
     bool isCond2Bullish =
         //
-        // false &&
+        false &&
         //
         isVolumeOverAvg &&
         isVolumeBullish &&
@@ -1095,7 +1114,7 @@ bool DetectXCAEAConditions(
     if (isCond2)
     {
         //
-        Print("Cond2");
+        // Print("Cond2");
     }
 
     //