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 f1c9914d..211a9cc1 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -34080,8 +34080,20 @@ bool XUSPY5XCHMACCHasLongSignal()
                                         ||
                                         //
                                         (mConditions.isXTDSignalUnderBear &&
-                                         mConditions.isXTSCurrentUnderFarest &&
-                                         mConditions.isXTSCurrentCrossedUnderFarest)
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentUnderFarest &&
+                                              mConditions.isXTSCurrentCrossedUnderFarest)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentMax &&
+                                              mConditions.isXTSCurrentOverFarest &&
+                                              mConditions.isXTSCurrentOverMediest)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -34215,6 +34227,12 @@ bool XUSPY5XCHMACCHasLongSignal()
                                              (mConditions.isXTSCurrentMax &&
                                               mConditions.isXTSCurrentCrossedOverNearest)
                                              //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentMax &&
+                                              mConditions.isXTSCurrentOverFarest &&
+                                              mConditions.isXTSCurrentOverMediest)
+                                             //
                                              )
                                          //
                                          )
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index cb1c23bc..0b281e48 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 HFMarkets ...
+Resolve XUSPY5 XCHMACC All Longs Stopouts in MetaQuotes ...
 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 f1c9914d..211a9cc1 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -34080,8 +34080,20 @@ bool XUSPY5XCHMACCHasLongSignal()
                                         ||
                                         //
                                         (mConditions.isXTDSignalUnderBear &&
-                                         mConditions.isXTSCurrentUnderFarest &&
-                                         mConditions.isXTSCurrentCrossedUnderFarest)
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentUnderFarest &&
+                                              mConditions.isXTSCurrentCrossedUnderFarest)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentMax &&
+                                              mConditions.isXTSCurrentOverFarest &&
+                                              mConditions.isXTSCurrentOverMediest)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -34215,6 +34227,12 @@ bool XUSPY5XCHMACCHasLongSignal()
                                              (mConditions.isXTSCurrentMax &&
                                               mConditions.isXTSCurrentCrossedOverNearest)
                                              //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentMax &&
+                                              mConditions.isXTSCurrentOverFarest &&
+                                              mConditions.isXTSCurrentOverMediest)
+                                             //
                                              )
                                          //
                                          )
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index f1c9914d..211a9cc1 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -34080,8 +34080,20 @@ bool XUSPY5XCHMACCHasLongSignal()
                                         ||
                                         //
                                         (mConditions.isXTDSignalUnderBear &&
-                                         mConditions.isXTSCurrentUnderFarest &&
-                                         mConditions.isXTSCurrentCrossedUnderFarest)
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentUnderFarest &&
+                                              mConditions.isXTSCurrentCrossedUnderFarest)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentMax &&
+                                              mConditions.isXTSCurrentOverFarest &&
+                                              mConditions.isXTSCurrentOverMediest)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -34215,6 +34227,12 @@ bool XUSPY5XCHMACCHasLongSignal()
                                              (mConditions.isXTSCurrentMax &&
                                               mConditions.isXTSCurrentCrossedOverNearest)
                                              //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentMax &&
+                                              mConditions.isXTSCurrentOverFarest &&
+                                              mConditions.isXTSCurrentOverMediest)
+                                             //
                                              )
                                          //
                                          )