diff --git a/XCAEA/Classes/xcaea.x-poi.detector.class.mq5 b/XCAEA/Classes/xcaea.x-poi.detector.class.mq5
index 90e98ceb..50bcebda 100644
--- a/XCAEA/Classes/xcaea.x-poi.detector.class.mq5
+++ b/XCAEA/Classes/xcaea.x-poi.detector.class.mq5
@@ -611,8 +611,9 @@ class XCXCAEAPOIDetector : public XCBase
 
     //
     // Pivot Verifications and Max Allowed Holding Items ...
-    int pivotVerifications; // Pivots Verifications ...
-    int maxAllowedPivots;   // Max Allowed Holding Pibots ...
+    int maxAllowedPivots;       // Max Allowed Holding Pibots ...
+    int pivotVerifications;     // Pivots Verifications ...
+    int pivotDetectionLoopbac; // Pivots Detection Loopback ...
 
     //
     // RSI Peak Pivot ...
@@ -748,6 +749,7 @@ class XCXCAEAPOIDetector : public XCBase
         //
         maxAllowedPivots = 50;
         pivotVerifications = 5;
+        pivotDetectionLoopbac = 100;
 
         //
         detectRSIPeakPivots = true;
@@ -766,8 +768,7 @@ class XCXCAEAPOIDetector : public XCBase
 
     //
     void Update(
-        int barIndex = 0,
-        int loopback = 400 //
+        int barIndex = 0 //
     )
     {
         //
@@ -777,7 +778,8 @@ class XCXCAEAPOIDetector : public XCBase
         }
 
         //
-        loopback = NormalizeInt(loopback, 400);
+        int loopback = pivotDetectionLoopbac;
+        loopback = NormalizeInt(loopback, 50);
 
         //
         int idx = -1;
@@ -1019,7 +1021,14 @@ class XCXCAEAPOIDetector : public XCBase
             if (detectRSIPeakPivots)
             {
                 //
-                if (isRSIPeak && isCBarHasBearishPower && conditions.isRSICrossedUnderOB)
+                bool checkingCondition =
+                    isRSIPeak &&
+                    isCBarHasBearishPower // &&
+                    // conditions.isRSICrossedUnderOB
+                    ;
+
+                //
+                if (checkingCondition)
                 {
                     //
                     XCAPivot iPivot;
@@ -1089,7 +1098,14 @@ class XCXCAEAPOIDetector : public XCBase
             if (detectRSIValePivots)
             {
                 //
-                if (isRSIVale && isCBarHasBullishPower && conditions.isRSICrossedOverOS)
+                bool checkingCondition =
+                    isRSIVale &&
+                    isCBarHasBullishPower // &&
+                    // conditions.isRSICrossedOverOS
+                    ;
+
+                //
+                if (checkingCondition)
                 {
                     //
                     XCAPivot iPivot;
@@ -1159,7 +1175,14 @@ class XCXCAEAPOIDetector : public XCBase
             if (detectCCIPeakPivots)
             {
                 //
-                if (isCCIPeak && isCBarHasBearishPower && conditions.isCCICrossedUnderOB)
+                bool checkingCondition =
+                    isCCIPeak &&
+                    isCBarHasBearishPower // &&
+                    // conditions.isCCICrossedUnderOB
+                    ;
+
+                //
+                if (checkingCondition)
                 {
                     //
                     XCAPivot iPivot;
@@ -1229,7 +1252,14 @@ class XCXCAEAPOIDetector : public XCBase
             if (detectCCIValePivots)
             {
                 //
-                if (isCCIVale && isCBarHasBullishPower && conditions.isCCICrossedOverOS)
+                bool checkingCondition =
+                    isCCIVale &&
+                    isCBarHasBullishPower // &&
+                    // conditions.isCCICrossedOverOS
+                    ;
+
+                //
+                if (checkingCondition)
                 {
                     //
                     XCAPivot iPivot;
diff --git a/XCAEA/Signals/xcaea.signaller.class.mq5 b/XCAEA/Signals/xcaea.signaller.class.mq5
index 26aa94a8..8eb5647a 100644
--- a/XCAEA/Signals/xcaea.signaller.class.mq5
+++ b/XCAEA/Signals/xcaea.signaller.class.mq5
@@ -727,6 +727,11 @@ class XCXCAEASignaller : XCBase
         // Initialize and Configure Detector ...
         detector = new XCXCAEAPOIDetector(helper);
 
+        //
+        detector.maxAllowedPivots = 50;   
+        detector.pivotVerifications = 5;
+        detector.pivotDetectionLoopbac = 100;
+
         //
         // Configure Detector ...
         detector.detectRSIPeakPivots = true;