diff --git a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index 676c5606..328fa052 100644
--- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -8014,10 +8014,22 @@ bool XUSCHF5XCHMACCHasShortSignal()
                            (
                                //
                                (mConditions.isXTMNeutural &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXCHLHMCLCLLSame &&
-                                mConditions.isXTSCurrentOverFarest &&
-                                mConditions.isXTSCurrentOverMediest)
+                                (
+                                    //
+                                    (mConditions.isXFIOverZero &&
+                                     mConditions.isXTSCurrentMax &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTDBullOverBear &&
+                                     mConditions.isXCHLHMCLCLLSame &&
+                                     mConditions.isXTSCurrentOverFarest &&
+                                     mConditions.isXTSCurrentOverMediest)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -8045,9 +8057,49 @@ bool XUSCHF5XCHMACCHasShortSignal()
                                  mConditions.isXAMABearish) &&
                                 (
                                     //
-                                    (mConditions.isXTSCurrentMin &&
+                                    (mConditions.isXLHHHDecreased &&
                                      mConditions.isXTDBullOverBear &&
-                                     mConditions.isXTDSignalCrossedUnderBear &&
+                                     mConditions.isXCHLHMCLCLLSame &&
+                                     mConditions.isXTSCurrentOverNearest)
+                                    //
+                                    ||
+                                    //
+                                    ((mConditions.isXTSCurrentMin &&
+                                      mConditions.isXTDBullOverBear) &&
+                                     (
+                                         //
+                                         mConditions.isXTSCurrentCrossedUnderFarest
+                                         //
+                                         ||
+                                         //
+                                         (mConditions.isXTDSignalCrossedUnderBear &&
+                                          mConditions.isXLHPriceCrossedUnderSignal)
+                                         //
+                                         )
+                                     //
+                                     )
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          ||
+                          //
+                          ((mConditions.isXCHMALCTrendsDown &&
+                            mConditions.isXCHMALCFastUnderSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMALCVale &&
+                                     mConditions.isXTSCurrentOverFarest &&
+                                     mConditions.isXTSCurrentOverNearest &&
                                      mConditions.isXLHPriceCrossedUnderSignal)
                                     //
                                     )
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index ec0f5d6a..513283ac 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -15,6 +15,6 @@ Resolve XUSCHF5 XTAM Shorts All Stopouts in All Markets ...
 Resolve XUSCHF5 XSI Shorts All Stopouts in All Markets ...
 Resolve XUSCHF5 XTSFI Shorts All Stopouts in All Markets ...
 Resolve XUSCHF5 XOBDLH Shorts All Stopouts in All Markets ...
-Resolve XUSCHF5 XCHMACC Shorts All Stopouts in MetaQuotes ...
+Resolve XUSCHF5 XCHMACC Shorts All Stopouts in AMarkets-Demo ...
 Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in  ...
 Resolve XUSCHF5 XCHMAMN Shorts All Stopouts in  ...
diff --git a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index 676c5606..328fa052 100644
--- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -8014,10 +8014,22 @@ bool XUSCHF5XCHMACCHasShortSignal()
                            (
                                //
                                (mConditions.isXTMNeutural &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXCHLHMCLCLLSame &&
-                                mConditions.isXTSCurrentOverFarest &&
-                                mConditions.isXTSCurrentOverMediest)
+                                (
+                                    //
+                                    (mConditions.isXFIOverZero &&
+                                     mConditions.isXTSCurrentMax &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTDBullOverBear &&
+                                     mConditions.isXCHLHMCLCLLSame &&
+                                     mConditions.isXTSCurrentOverFarest &&
+                                     mConditions.isXTSCurrentOverMediest)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -8045,9 +8057,49 @@ bool XUSCHF5XCHMACCHasShortSignal()
                                  mConditions.isXAMABearish) &&
                                 (
                                     //
-                                    (mConditions.isXTSCurrentMin &&
+                                    (mConditions.isXLHHHDecreased &&
                                      mConditions.isXTDBullOverBear &&
-                                     mConditions.isXTDSignalCrossedUnderBear &&
+                                     mConditions.isXCHLHMCLCLLSame &&
+                                     mConditions.isXTSCurrentOverNearest)
+                                    //
+                                    ||
+                                    //
+                                    ((mConditions.isXTSCurrentMin &&
+                                      mConditions.isXTDBullOverBear) &&
+                                     (
+                                         //
+                                         mConditions.isXTSCurrentCrossedUnderFarest
+                                         //
+                                         ||
+                                         //
+                                         (mConditions.isXTDSignalCrossedUnderBear &&
+                                          mConditions.isXLHPriceCrossedUnderSignal)
+                                         //
+                                         )
+                                     //
+                                     )
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          ||
+                          //
+                          ((mConditions.isXCHMALCTrendsDown &&
+                            mConditions.isXCHMALCFastUnderSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMALCVale &&
+                                     mConditions.isXTSCurrentOverFarest &&
+                                     mConditions.isXTSCurrentOverNearest &&
                                      mConditions.isXLHPriceCrossedUnderSignal)
                                     //
                                     )
diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index 676c5606..328fa052 100644
--- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -8014,10 +8014,22 @@ bool XUSCHF5XCHMACCHasShortSignal()
                            (
                                //
                                (mConditions.isXTMNeutural &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXCHLHMCLCLLSame &&
-                                mConditions.isXTSCurrentOverFarest &&
-                                mConditions.isXTSCurrentOverMediest)
+                                (
+                                    //
+                                    (mConditions.isXFIOverZero &&
+                                     mConditions.isXTSCurrentMax &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTDBullOverBear &&
+                                     mConditions.isXCHLHMCLCLLSame &&
+                                     mConditions.isXTSCurrentOverFarest &&
+                                     mConditions.isXTSCurrentOverMediest)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -8045,9 +8057,49 @@ bool XUSCHF5XCHMACCHasShortSignal()
                                  mConditions.isXAMABearish) &&
                                 (
                                     //
-                                    (mConditions.isXTSCurrentMin &&
+                                    (mConditions.isXLHHHDecreased &&
                                      mConditions.isXTDBullOverBear &&
-                                     mConditions.isXTDSignalCrossedUnderBear &&
+                                     mConditions.isXCHLHMCLCLLSame &&
+                                     mConditions.isXTSCurrentOverNearest)
+                                    //
+                                    ||
+                                    //
+                                    ((mConditions.isXTSCurrentMin &&
+                                      mConditions.isXTDBullOverBear) &&
+                                     (
+                                         //
+                                         mConditions.isXTSCurrentCrossedUnderFarest
+                                         //
+                                         ||
+                                         //
+                                         (mConditions.isXTDSignalCrossedUnderBear &&
+                                          mConditions.isXLHPriceCrossedUnderSignal)
+                                         //
+                                         )
+                                     //
+                                     )
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          ||
+                          //
+                          ((mConditions.isXCHMALCTrendsDown &&
+                            mConditions.isXCHMALCFastUnderSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMALCVale &&
+                                     mConditions.isXTSCurrentOverFarest &&
+                                     mConditions.isXTSCurrentOverNearest &&
                                      mConditions.isXLHPriceCrossedUnderSignal)
                                     //
                                     )