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 29a2d664..0bfd882f 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -39192,11 +39192,21 @@ bool XUSPY5XCHMACCHasLongSignal()
                                         (mConditions.isXTSCurrentUnderFarest &&
                                          (
                                              //
-                                             (mConditions.isXCHMALCPeak &&
-                                              mConditions.isXLHLLDecreased &&
-                                              mConditions.isXCHLHMCLCHHSame &&
-                                              mConditions.isXTDBullCrossedOverBear &&
-                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXCHLHMCLCHHSame) &&
+                                              (
+                                                  //
+                                                  mConditions.isXAMAStartBullish
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXLHLLDecreased &&
+                                                   mConditions.isXTDBullCrossedOverBear &&
+                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -40133,12 +40143,23 @@ bool XUSPY5XCHMACCHasLongSignal()
                                    (mConditions.isXTDSignalUnderBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCPeak &&
-                                         mConditions.isXTSCurrentMax &&
-                                         mConditions.isXCHMASCOverMax &&
-                                         mConditions.isXCHLHSCMCHHSame &&
-                                         mConditions.isXCHLHSCMCLLSame &&
-                                         mConditions.isXCHMASCCrossedOverMax)
+                                        ((mConditions.isXCHMALCPeak &&
+                                          mConditions.isXTSCurrentMax &&
+                                          mConditions.isXCHMASCOverMax) &&
+                                         (
+                                             //
+                                             (mConditions.isXLHLLIncreased &&
+                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXCHLHSCMCHHSame &&
+                                              mConditions.isXCHLHSCMCLLSame &&
+                                              mConditions.isXCHMASCCrossedOverMax)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         ||
                                         //
@@ -40428,12 +40449,17 @@ bool XUSPY5XCHMACCHasLongSignal()
                                 mConditions.isXCHMAMCFastOverSlow) &&
                                (
                                    //
-                                   (mConditions.isXTSCurrentUnderFarest &&
+                                   ((mConditions.isXCHMALCPeak &&
+                                     mConditions.isXCHLHMCLCHHSame &&
+                                     mConditions.isXAMAStartBullish) &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCPeak &&
-                                         mConditions.isXAMAStartBullish &&
-                                         mConditions.isXCHLHMCLCHHSame &&
+                                        (mConditions.isXTSCurrentMax &&
+                                         mConditions.isXTDSignalUnderBear)
+                                        //
+                                        ||
+                                        //
+                                        (mConditions.isXTSCurrentUnderFarest &&
                                          mConditions.isXTDSignalCrossedOverBear)
                                         //
                                         )
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index d31484b1..dc44239e 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -44,7 +44,7 @@ XCHMACC
 --------
 Resolve XUSPY5 XCHMACC All Stopouts in All Markets ...
 Resolve XUSPY5 XCHMACC All Critical Guard Attacks in All Markets ...
-Resolve XUSPY5 XCHMACC All Longs Guard Attacks in All MetaQuotes ...
+Resolve XUSPY5 XCHMACC All Longs Guard Attacks in All HFMarkets ...
 
 
 
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 29a2d664..0bfd882f 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -39192,11 +39192,21 @@ bool XUSPY5XCHMACCHasLongSignal()
                                         (mConditions.isXTSCurrentUnderFarest &&
                                          (
                                              //
-                                             (mConditions.isXCHMALCPeak &&
-                                              mConditions.isXLHLLDecreased &&
-                                              mConditions.isXCHLHMCLCHHSame &&
-                                              mConditions.isXTDBullCrossedOverBear &&
-                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXCHLHMCLCHHSame) &&
+                                              (
+                                                  //
+                                                  mConditions.isXAMAStartBullish
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXLHLLDecreased &&
+                                                   mConditions.isXTDBullCrossedOverBear &&
+                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -40133,12 +40143,23 @@ bool XUSPY5XCHMACCHasLongSignal()
                                    (mConditions.isXTDSignalUnderBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCPeak &&
-                                         mConditions.isXTSCurrentMax &&
-                                         mConditions.isXCHMASCOverMax &&
-                                         mConditions.isXCHLHSCMCHHSame &&
-                                         mConditions.isXCHLHSCMCLLSame &&
-                                         mConditions.isXCHMASCCrossedOverMax)
+                                        ((mConditions.isXCHMALCPeak &&
+                                          mConditions.isXTSCurrentMax &&
+                                          mConditions.isXCHMASCOverMax) &&
+                                         (
+                                             //
+                                             (mConditions.isXLHLLIncreased &&
+                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXCHLHSCMCHHSame &&
+                                              mConditions.isXCHLHSCMCLLSame &&
+                                              mConditions.isXCHMASCCrossedOverMax)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         ||
                                         //
@@ -40428,12 +40449,17 @@ bool XUSPY5XCHMACCHasLongSignal()
                                 mConditions.isXCHMAMCFastOverSlow) &&
                                (
                                    //
-                                   (mConditions.isXTSCurrentUnderFarest &&
+                                   ((mConditions.isXCHMALCPeak &&
+                                     mConditions.isXCHLHMCLCHHSame &&
+                                     mConditions.isXAMAStartBullish) &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCPeak &&
-                                         mConditions.isXAMAStartBullish &&
-                                         mConditions.isXCHLHMCLCHHSame &&
+                                        (mConditions.isXTSCurrentMax &&
+                                         mConditions.isXTDSignalUnderBear)
+                                        //
+                                        ||
+                                        //
+                                        (mConditions.isXTSCurrentUnderFarest &&
                                          mConditions.isXTDSignalCrossedOverBear)
                                         //
                                         )
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 29a2d664..0bfd882f 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -39192,11 +39192,21 @@ bool XUSPY5XCHMACCHasLongSignal()
                                         (mConditions.isXTSCurrentUnderFarest &&
                                          (
                                              //
-                                             (mConditions.isXCHMALCPeak &&
-                                              mConditions.isXLHLLDecreased &&
-                                              mConditions.isXCHLHMCLCHHSame &&
-                                              mConditions.isXTDBullCrossedOverBear &&
-                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXCHLHMCLCHHSame) &&
+                                              (
+                                                  //
+                                                  mConditions.isXAMAStartBullish
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXLHLLDecreased &&
+                                                   mConditions.isXTDBullCrossedOverBear &&
+                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -40133,12 +40143,23 @@ bool XUSPY5XCHMACCHasLongSignal()
                                    (mConditions.isXTDSignalUnderBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCPeak &&
-                                         mConditions.isXTSCurrentMax &&
-                                         mConditions.isXCHMASCOverMax &&
-                                         mConditions.isXCHLHSCMCHHSame &&
-                                         mConditions.isXCHLHSCMCLLSame &&
-                                         mConditions.isXCHMASCCrossedOverMax)
+                                        ((mConditions.isXCHMALCPeak &&
+                                          mConditions.isXTSCurrentMax &&
+                                          mConditions.isXCHMASCOverMax) &&
+                                         (
+                                             //
+                                             (mConditions.isXLHLLIncreased &&
+                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXCHLHSCMCHHSame &&
+                                              mConditions.isXCHLHSCMCLLSame &&
+                                              mConditions.isXCHMASCCrossedOverMax)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         ||
                                         //
@@ -40428,12 +40449,17 @@ bool XUSPY5XCHMACCHasLongSignal()
                                 mConditions.isXCHMAMCFastOverSlow) &&
                                (
                                    //
-                                   (mConditions.isXTSCurrentUnderFarest &&
+                                   ((mConditions.isXCHMALCPeak &&
+                                     mConditions.isXCHLHMCLCHHSame &&
+                                     mConditions.isXAMAStartBullish) &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCPeak &&
-                                         mConditions.isXAMAStartBullish &&
-                                         mConditions.isXCHLHMCLCHHSame &&
+                                        (mConditions.isXTSCurrentMax &&
+                                         mConditions.isXTDSignalUnderBear)
+                                        //
+                                        ||
+                                        //
+                                        (mConditions.isXTSCurrentUnderFarest &&
                                          mConditions.isXTDSignalCrossedOverBear)
                                         //
                                         )