diff --git a/Classes/x-saherelm.x-poi.drawer.class.mq5 b/Classes/x-saherelm.x-poi.drawer.class.mq5
index 5116f3a7..9cc06c89 100644
--- a/Classes/x-saherelm.x-poi.drawer.class.mq5
+++ b/Classes/x-saherelm.x-poi.drawer.class.mq5
@@ -3169,7 +3169,8 @@ class XCPOIDrawer : public XCBase
             XCOHCLObject *iObj;
             bool isCreated = CreateBar(
                 model.lowestValeBar,
-                iObj //
+                iObj,
+                cTime //
             );
 
             //
@@ -3190,7 +3191,8 @@ class XCPOIDrawer : public XCBase
             XCOHCLObject *iObj;
             bool isCreated = CreateBar(
                 model.lowestValePeakBreakeUpBar,
-                iObj //
+                iObj,
+                cTime //
             );
 
             //
@@ -3211,7 +3213,8 @@ class XCPOIDrawer : public XCBase
             XCOHCLObject *iObj;
             bool isCreated = CreateBar(
                 model.valeAboveLowestValePeakBar,
-                iObj //
+                iObj,
+                cTime //
             );
 
             //
@@ -3232,7 +3235,8 @@ class XCPOIDrawer : public XCBase
             XCOHCLObject *iObj;
             bool isCreated = CreateBar(
                 model.highestPeakBar,
-                iObj //
+                iObj,
+                cTime //
             );
 
             //
@@ -3253,7 +3257,8 @@ class XCPOIDrawer : public XCBase
             XCOHCLObject *iObj;
             bool isCreated = CreateBar(
                 model.peakBelowHighestPeakValeBar,
-                iObj //
+                iObj,
+                cTime //
             );
 
             //
@@ -3274,7 +3279,8 @@ class XCPOIDrawer : public XCBase
             XCOHCLObject *iObj;
             bool isCreated = CreateBar(
                 model.highestPeakValeBreakeDownBar,
-                iObj //
+                iObj,
+                cTime //
             );
 
             //
@@ -3302,7 +3308,8 @@ class XCPOIDrawer : public XCBase
                 XCBaseObject *ipObjects[];
                 int ipDrawnObjects = DrawPriceZone(
                     ipZone,
-                    ipObjects //
+                    ipObjects,
+                    model.bias //
                 );
                 if (IsValidSize(ipObjects))
                 {
@@ -3330,7 +3337,8 @@ class XCPOIDrawer : public XCBase
                 XCBaseObject *ipObjects[];
                 int ipDrawnObjects = DrawPriceZone(
                     ipZone,
-                    ipObjects //
+                    ipObjects,
+                    model.bias //
                 );
                 if (IsValidSize(ipObjects))
                 {
diff --git a/X121SMCEA/Signals/x-121.smc.xtwpv.signal.lib.mq5 b/X121SMCEA/Signals/x-121.smc.xtwpv.signal.lib.mq5
index f2c5987f..ba1637da 100644
--- a/X121SMCEA/Signals/x-121.smc.xtwpv.signal.lib.mq5
+++ b/X121SMCEA/Signals/x-121.smc.xtwpv.signal.lib.mq5
@@ -647,10 +647,29 @@ bool DetectX121SMCXTWPVSiganlSetup(
     // Setup Conditions ...
 
     //
-    XMarketStructure marketStructure;
-    bool hasMarketStructure =
+    XMarketStructure consolidationMarketStructure;
+    bool hasConsolidationMarketStructure =
+        consolidationCycleHelper
+            .DetectMarketStructure(consolidationMarketStructure);
+
+    //
+    XMarketStructure analyseMarketStructure;
+    bool hasAnalyseMarketStructure =
         analyseCycleHelper
-            .DetectMarketStructure(marketStructure);
+            .DetectMarketStructure(analyseMarketStructure);
+
+    //
+    // Check Same Bias ...
+    result =
+        hasAnalyseMarketStructure &&
+        hasConsolidationMarketStructure &&
+        analyseMarketStructure.HasTrend() &&
+        consolidationMarketStructure.HasTrend() &&
+        analyseMarketStructure.bias == consolidationMarketStructure.bias;
+    if (!result)
+    {
+        return result;
+    }
 
     //
     XOHCL analyseCBar;