diff --git a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 211a9cc1..e713c62d 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -34079,6 +34079,24 @@ bool XUSPY5XCHMACCHasLongSignal()
                                         //
                                         ||
                                         //
+                                        (mConditions.isXTSCurrentUnderNearest &&
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentCrossedUnderNearest &&
+                                              (
+                                                  //
+                                                  mConditions.isXTDSignalCrossedOverBear
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
+                                        //
                                         (mConditions.isXTDSignalUnderBear &&
                                          (
                                              //
@@ -34285,11 +34303,37 @@ bool XUSPY5XCHMACCHasLongSignal()
                                    (mConditions.isXTDSignalUnderBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCPeak &&
-                                         mConditions.isXTSCurrentMax &&
-                                         mConditions.isXCHMASCOverMax &&
-                                         mConditions.isXCHMASCCrossedOverMax &&
-                                         mConditions.isXTSCurrentCrossedOverNearest)
+                                        ((mConditions.isXCHMALCPeak &&
+                                          mConditions.isXCHMASCOverMax) &&
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentMax &&
+                                              mConditions.isXCHMASCCrossedOverMax &&
+                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentUnderNearest &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTSCurrentCrossedUnderNearest &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXTMStartBullish &&
+                                                        mConditions.isXTDBullCrossedOverBear &&
+                                                        mConditions.isXLHPriceCrossedOverSignal)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 0b281e48..2fa8ab54 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -42,7 +42,7 @@ Resolve XUSPY5 XTSFI All Guard Attacks in All Markets ...
 
 XCHMACC
 --------
-Resolve XUSPY5 XCHMACC All Longs Stopouts in MetaQuotes ...
+Resolve XUSPY5 XCHMACC All Longs Stopouts in AMarkets-Demo ...
 Resolve XUSPY5 XCHMACC All Critical Guard Attacks in All Markets ...
 Resolve XUSPY5 XCHMACC All Guard Attacks in All Markets ...
 
diff --git a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 211a9cc1..e713c62d 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -34079,6 +34079,24 @@ bool XUSPY5XCHMACCHasLongSignal()
                                         //
                                         ||
                                         //
+                                        (mConditions.isXTSCurrentUnderNearest &&
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentCrossedUnderNearest &&
+                                              (
+                                                  //
+                                                  mConditions.isXTDSignalCrossedOverBear
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
+                                        //
                                         (mConditions.isXTDSignalUnderBear &&
                                          (
                                              //
@@ -34285,11 +34303,37 @@ bool XUSPY5XCHMACCHasLongSignal()
                                    (mConditions.isXTDSignalUnderBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCPeak &&
-                                         mConditions.isXTSCurrentMax &&
-                                         mConditions.isXCHMASCOverMax &&
-                                         mConditions.isXCHMASCCrossedOverMax &&
-                                         mConditions.isXTSCurrentCrossedOverNearest)
+                                        ((mConditions.isXCHMALCPeak &&
+                                          mConditions.isXCHMASCOverMax) &&
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentMax &&
+                                              mConditions.isXCHMASCCrossedOverMax &&
+                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentUnderNearest &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTSCurrentCrossedUnderNearest &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXTMStartBullish &&
+                                                        mConditions.isXTDBullCrossedOverBear &&
+                                                        mConditions.isXLHPriceCrossedOverSignal)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 211a9cc1..e713c62d 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -34079,6 +34079,24 @@ bool XUSPY5XCHMACCHasLongSignal()
                                         //
                                         ||
                                         //
+                                        (mConditions.isXTSCurrentUnderNearest &&
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentCrossedUnderNearest &&
+                                              (
+                                                  //
+                                                  mConditions.isXTDSignalCrossedOverBear
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
+                                        //
                                         (mConditions.isXTDSignalUnderBear &&
                                          (
                                              //
@@ -34285,11 +34303,37 @@ bool XUSPY5XCHMACCHasLongSignal()
                                    (mConditions.isXTDSignalUnderBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCPeak &&
-                                         mConditions.isXTSCurrentMax &&
-                                         mConditions.isXCHMASCOverMax &&
-                                         mConditions.isXCHMASCCrossedOverMax &&
-                                         mConditions.isXTSCurrentCrossedOverNearest)
+                                        ((mConditions.isXCHMALCPeak &&
+                                          mConditions.isXCHMASCOverMax) &&
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentMax &&
+                                              mConditions.isXCHMASCCrossedOverMax &&
+                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentUnderNearest &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTSCurrentCrossedUnderNearest &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXTMStartBullish &&
+                                                        mConditions.isXTDBullCrossedOverBear &&
+                                                        mConditions.isXLHPriceCrossedOverSignal)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //