diff --git a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
index f9456d13..0e383971 100644
--- a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
@@ -8412,17 +8412,49 @@ bool XAU5XOBDLHHasShortSignal()
                           //
                           ((mConditions.isXCHMAMCPeak &&
                             mConditions.isXTDBullOverBear &&
-                            mConditions.isXCHLHSCMCHHSame &&
-                            mConditions.isXCHMASCTrendsDown) &&
+                            mConditions.isXCHLHSCMCHHSame) &&
                            (
                                //
-                               (mConditions.isXCHMALCPeak &&
-                                mConditions.isXTDSignalVale &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXCHMASCOverMax &&
-                                mConditions.isXTDBullishVale &&
-                                mConditions.isXTDSignalUnderBear &&
-                                mConditions.isXCHMASCFastOverSlow)
+                               ((mConditions.isXCHMALCPeak &&
+                                 mConditions.isXTDSignalVale &&
+                                 mConditions.isXTDBullishVale &&
+                                 mConditions.isXCHMASCOverMax &&
+                                 mConditions.isXTDSignalUnderBear) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXCHMALCTrendsUp &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXCHMASCTrendsDown &&
+                                     mConditions.isXCHMASCFastOverSlow)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               ||
+                               //
+                               (mConditions.isXTMBullish &&
+                                mConditions.isXAMABullish &&
+                                mConditions.isXCHMASCPeak &&
+                                mConditions.isXCHMAMCPeak &&
+                                mConditions.isXCHMALCPeak &&
+                                mConditions.isXCHMASCTrendsUp &&
+                                mConditions.isXCHMAMCTrendsUp &&
+                                mConditions.isXCHMALCTrendsUp)
+                               //
+                               ||
+                               //
+                               (mConditions.isXTSCurrentMax &&
+                                mConditions.isXLHHHIncreased &&
+                                mConditions.isXTDSignalOverBear &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentOverNearest &&
+                                mConditions.isXTSCurrentOverMediest)
                                //
                                ||
                                //
@@ -8432,18 +8464,31 @@ bool XAU5XOBDLHHasShortSignal()
                                  mConditions.isXCHMALCTrendsDown) &&
                                 (
                                     //
-                                    (mConditions.isXCHMALCPeak &&
-                                     mConditions.isXTDBearishVale &&
-                                     mConditions.isXCHMAMCTrendsUp &&
-                                     mConditions.isXTDSignalOverBear &&
-                                     mConditions.isXTSCurrentOverFarest &&
-                                     mConditions.isXTSCurrentOverMediest)
+                                    ((mConditions.isXTDSignalOverBear &&
+                                      mConditions.isXTSCurrentOverFarest &&
+                                      mConditions.isXTSCurrentOverMediest) &&
+                                     (
+                                         //
+                                         (mConditions.isXCHMASCOverMax &&
+                                          mConditions.isXTDBullOverBear)
+                                         //
+                                         ||
+                                         //
+                                         (mConditions.isXCHMALCPeak &&
+                                          mConditions.isXTDBearishVale &&
+                                          mConditions.isXCHMAMCTrendsUp &&
+                                          mConditions.isXCHMASCTrendsDown)
+                                         //
+                                         )
+                                     //
+                                     )
                                     //
                                     ||
                                     //
                                     (mConditions.isXCHMALCVale &&
                                      mConditions.isXTDSignalVale &&
                                      mConditions.isXTDBullishVale &&
+                                     mConditions.isXCHMASCTrendsDown &&
                                      mConditions.isXCHMAMCTrendsDown &&
                                      mConditions.isXTDSignalUnderBear &&
                                      mConditions.isXTSCurrentOverNearest)
diff --git a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
index f9456d13..0e383971 100644
--- a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
+++ b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
@@ -8412,17 +8412,49 @@ bool XAU5XOBDLHHasShortSignal()
                           //
                           ((mConditions.isXCHMAMCPeak &&
                             mConditions.isXTDBullOverBear &&
-                            mConditions.isXCHLHSCMCHHSame &&
-                            mConditions.isXCHMASCTrendsDown) &&
+                            mConditions.isXCHLHSCMCHHSame) &&
                            (
                                //
-                               (mConditions.isXCHMALCPeak &&
-                                mConditions.isXTDSignalVale &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXCHMASCOverMax &&
-                                mConditions.isXTDBullishVale &&
-                                mConditions.isXTDSignalUnderBear &&
-                                mConditions.isXCHMASCFastOverSlow)
+                               ((mConditions.isXCHMALCPeak &&
+                                 mConditions.isXTDSignalVale &&
+                                 mConditions.isXTDBullishVale &&
+                                 mConditions.isXCHMASCOverMax &&
+                                 mConditions.isXTDSignalUnderBear) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXCHMALCTrendsUp &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXCHMASCTrendsDown &&
+                                     mConditions.isXCHMASCFastOverSlow)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               ||
+                               //
+                               (mConditions.isXTMBullish &&
+                                mConditions.isXAMABullish &&
+                                mConditions.isXCHMASCPeak &&
+                                mConditions.isXCHMAMCPeak &&
+                                mConditions.isXCHMALCPeak &&
+                                mConditions.isXCHMASCTrendsUp &&
+                                mConditions.isXCHMAMCTrendsUp &&
+                                mConditions.isXCHMALCTrendsUp)
+                               //
+                               ||
+                               //
+                               (mConditions.isXTSCurrentMax &&
+                                mConditions.isXLHHHIncreased &&
+                                mConditions.isXTDSignalOverBear &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentOverNearest &&
+                                mConditions.isXTSCurrentOverMediest)
                                //
                                ||
                                //
@@ -8432,18 +8464,31 @@ bool XAU5XOBDLHHasShortSignal()
                                  mConditions.isXCHMALCTrendsDown) &&
                                 (
                                     //
-                                    (mConditions.isXCHMALCPeak &&
-                                     mConditions.isXTDBearishVale &&
-                                     mConditions.isXCHMAMCTrendsUp &&
-                                     mConditions.isXTDSignalOverBear &&
-                                     mConditions.isXTSCurrentOverFarest &&
-                                     mConditions.isXTSCurrentOverMediest)
+                                    ((mConditions.isXTDSignalOverBear &&
+                                      mConditions.isXTSCurrentOverFarest &&
+                                      mConditions.isXTSCurrentOverMediest) &&
+                                     (
+                                         //
+                                         (mConditions.isXCHMASCOverMax &&
+                                          mConditions.isXTDBullOverBear)
+                                         //
+                                         ||
+                                         //
+                                         (mConditions.isXCHMALCPeak &&
+                                          mConditions.isXTDBearishVale &&
+                                          mConditions.isXCHMAMCTrendsUp &&
+                                          mConditions.isXCHMASCTrendsDown)
+                                         //
+                                         )
+                                     //
+                                     )
                                     //
                                     ||
                                     //
                                     (mConditions.isXCHMALCVale &&
                                      mConditions.isXTDSignalVale &&
                                      mConditions.isXTDBullishVale &&
+                                     mConditions.isXCHMASCTrendsDown &&
                                      mConditions.isXCHMAMCTrendsDown &&
                                      mConditions.isXTDSignalUnderBear &&
                                      mConditions.isXTSCurrentOverNearest)
diff --git a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
index f9456d13..0e383971 100644
--- a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
@@ -8412,17 +8412,49 @@ bool XAU5XOBDLHHasShortSignal()
                           //
                           ((mConditions.isXCHMAMCPeak &&
                             mConditions.isXTDBullOverBear &&
-                            mConditions.isXCHLHSCMCHHSame &&
-                            mConditions.isXCHMASCTrendsDown) &&
+                            mConditions.isXCHLHSCMCHHSame) &&
                            (
                                //
-                               (mConditions.isXCHMALCPeak &&
-                                mConditions.isXTDSignalVale &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXCHMASCOverMax &&
-                                mConditions.isXTDBullishVale &&
-                                mConditions.isXTDSignalUnderBear &&
-                                mConditions.isXCHMASCFastOverSlow)
+                               ((mConditions.isXCHMALCPeak &&
+                                 mConditions.isXTDSignalVale &&
+                                 mConditions.isXTDBullishVale &&
+                                 mConditions.isXCHMASCOverMax &&
+                                 mConditions.isXTDSignalUnderBear) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXCHMALCTrendsUp &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXCHMASCTrendsDown &&
+                                     mConditions.isXCHMASCFastOverSlow)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               ||
+                               //
+                               (mConditions.isXTMBullish &&
+                                mConditions.isXAMABullish &&
+                                mConditions.isXCHMASCPeak &&
+                                mConditions.isXCHMAMCPeak &&
+                                mConditions.isXCHMALCPeak &&
+                                mConditions.isXCHMASCTrendsUp &&
+                                mConditions.isXCHMAMCTrendsUp &&
+                                mConditions.isXCHMALCTrendsUp)
+                               //
+                               ||
+                               //
+                               (mConditions.isXTSCurrentMax &&
+                                mConditions.isXLHHHIncreased &&
+                                mConditions.isXTDSignalOverBear &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentOverNearest &&
+                                mConditions.isXTSCurrentOverMediest)
                                //
                                ||
                                //
@@ -8432,18 +8464,31 @@ bool XAU5XOBDLHHasShortSignal()
                                  mConditions.isXCHMALCTrendsDown) &&
                                 (
                                     //
-                                    (mConditions.isXCHMALCPeak &&
-                                     mConditions.isXTDBearishVale &&
-                                     mConditions.isXCHMAMCTrendsUp &&
-                                     mConditions.isXTDSignalOverBear &&
-                                     mConditions.isXTSCurrentOverFarest &&
-                                     mConditions.isXTSCurrentOverMediest)
+                                    ((mConditions.isXTDSignalOverBear &&
+                                      mConditions.isXTSCurrentOverFarest &&
+                                      mConditions.isXTSCurrentOverMediest) &&
+                                     (
+                                         //
+                                         (mConditions.isXCHMASCOverMax &&
+                                          mConditions.isXTDBullOverBear)
+                                         //
+                                         ||
+                                         //
+                                         (mConditions.isXCHMALCPeak &&
+                                          mConditions.isXTDBearishVale &&
+                                          mConditions.isXCHMAMCTrendsUp &&
+                                          mConditions.isXCHMASCTrendsDown)
+                                         //
+                                         )
+                                     //
+                                     )
                                     //
                                     ||
                                     //
                                     (mConditions.isXCHMALCVale &&
                                      mConditions.isXTDSignalVale &&
                                      mConditions.isXTDBullishVale &&
+                                     mConditions.isXCHMASCTrendsDown &&
                                      mConditions.isXCHMAMCTrendsDown &&
                                      mConditions.isXTDSignalUnderBear &&
                                      mConditions.isXTSCurrentOverNearest)