diff --git a/XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5 b/XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5
index 83495139..31e07443 100644
--- a/XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5
+++ b/XFIMAEA/Classes/x-saherelm.xfima.signaller.class.mq5
@@ -544,10 +544,10 @@ class XCXFIMAStrategy1Signaller : public XCXFIMABaseSignaller
 
         //
         // Signaller Flags ...
-        bool useSignaller1 = true;
-        bool useSignaller2 = true;
-        bool useSignaller3 = true;
-        bool useSignaller4 = false;
+        bool useSignaller1 = false;
+        bool useSignaller2 = false;
+        bool useSignaller3 = false;
+        bool useSignaller4 = true;
 
         //
         // Validator Flags ...
@@ -1727,10 +1727,13 @@ class XCXFIMAStrategy1Signaller : public XCXFIMABaseSignaller
             pBar,
             dir,
             orderFlow,
-            2,
-            false, // Contains OB ...
-            true,  // Contains FVG ...
-            false  // Contains Support and Resistances ...
+            structureConfig.orderFlowValidation,
+            structureConfig.orderFlowUseOB,
+            structureConfig.orderFlowUseFVG,
+            structureConfig.orderFlowUseSupportAndResistance,
+            structureConfig.barsAnalysisConfig.supportAndResistanceLoopbackLength,
+            structureConfig.barsAnalysisConfig.supportAndResistanceValidationLength,
+            structureConfig.loopback //
         );
 
         //
@@ -1744,6 +1747,11 @@ class XCXFIMAStrategy1Signaller : public XCXFIMABaseSignaller
         //
         result = isBullish ||
                  isBearish;
+        if (result) {
+            //
+            poiDrawer.DrawZones(orderFlow, structureDrawConfig.drawConfig);
+            Print("OrderFlow ...");
+        }
 
         //
         isBullish =