diff --git a/Experts/x-saherelm.xau5.ea.mq5 b/Experts/x-saherelm.xau5.ea.mq5
index 002dbff8..46c0da65 100644
--- a/Experts/x-saherelm.xau5.ea.mq5
+++ b/Experts/x-saherelm.xau5.ea.mq5
@@ -298,7 +298,8 @@ void OnTick()
     }
 
     //
-    if (!IsNewCandle() && xAU5WaitUntilNextCandle)
+    //  && xAU5WaitUntilNextCandle
+    if (!IsNewCandle())
     {
         return;
     }
diff --git a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
index 020cda1c..f5f13ba0 100644
--- a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
@@ -1558,6 +1558,14 @@ bool XAU5XTDHasLongSignal()
                       //
                       ||
                       //
+                      (mConditions.isXCHMALCPeak &&
+                       mConditions.isXAMANeutural &&
+                       mConditions.isXCHMAMCTrendsDown &&
+                       mConditions.isXTSCurrentUnderFarest &&
+                       mConditions.isXTDSignalCrossedOverBear)
+                      //
+                      ||
+                      //
                       (mConditions.isXCHMALCPeak &&
                        mConditions.isXTDBullOverBear &&
                        mConditions.isXCHMAMCTrendsDown &&
@@ -1763,7 +1771,10 @@ bool XAU5XTDHasLongSignal()
                    !mConditions.isXLHLLSameInLength) &&
                   //
                   (
-                      false)
+                      //
+                      false
+                      //
+                      )
                   //
                   )
                  //
@@ -1800,12 +1811,6 @@ bool XAU5XTDHasLongSignal()
                                //
                                ||
                                //
-                               (mConditions.isXTMNeutural &&
-                                mConditions.isXTDBearishVale &&
-                                mConditions.isXLHPriceCrossedUnderSignal)
-                               //
-                               ||
-                               //
                                (mConditions.isXCHMAMCVale &&
                                 mConditions.isXTSCurrentMax &&
                                 mConditions.isXCHLHMCLCLLSame &&
@@ -1813,10 +1818,27 @@ bool XAU5XTDHasLongSignal()
                                //
                                ||
                                //
-                               (mConditions.isXCHMAMCVale &&
-                                mConditions.isXCHMALCVale &&
-                                mConditions.isXTDBearishVale &&
-                                mConditions.isXLHLLIncreased)
+                               (mConditions.isXTDBearishVale &&
+                                (
+                                    //
+                                    (mConditions.isXTMNeutural &&
+                                     mConditions.isXLHPriceCrossedUnderSignal)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXCHLHMCLCHHSame &&
+                                     mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXTSCurrentUnderFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXCHMAMCVale &&
+                                     mConditions.isXCHMALCVale &&
+                                     mConditions.isXLHLLIncreased)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                ||
                                //
@@ -1910,6 +1932,14 @@ bool XAU5XTDHasLongSignal()
                                //
                                ||
                                //
+                               (mConditions.isXCHMALCVale &&
+                                mConditions.isXAMANeutural &&
+                                mConditions.isXTSCurrentMax &&
+                                mConditions.isXTMStartBullish &&
+                                mConditions.isXTDSignalCrossedOverBear)
+                               //
+                               ||
+                               //
                                (mConditions.isXCHMALCVale &&
                                 mConditions.isXAMANeutural &&
                                 mConditions.isXTSCurrentMax &&