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 d4771c73..02aa762e 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -38368,10 +38368,21 @@ bool XUSPY5XCHMACCHasShortSignal()
                                           mConditions.isXCHMAMCFastUnderSlow) &&
                                          (
                                              //
-                                             (mConditions.isXCHMALCVale &&
-                                              mConditions.isXTSCurrentMin &&
-                                              mConditions.isXCHMASCUnderMin &&
-                                              mConditions.isXTSCurrentCrossedUnderNearest)
+                                             ((mConditions.isXCHMALCVale &&
+                                               mConditions.isXCHMASCUnderMin) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTSCurrentOverFarest &&
+                                                   mConditions.isXTSCurrentCrossedUnderNearest)
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXTSCurrentMin &&
+                                                   mConditions.isXTSCurrentCrossedUnderNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -38729,11 +38740,21 @@ bool XUSPY5XCHMACCHasShortSignal()
                                         (mConditions.isXTDBullCrossedOverBear &&
                                          (
                                              //
-                                             (mConditions.isXCHMALCVale &&
-                                              mConditions.isXAMANeutural &&
-                                              mConditions.isXCHLHSCMCHHSame &&
-                                              mConditions.isXCHMASCUnderMin &&
-                                              mConditions.isXCHMASCCrossedUnderMin)
+                                             ((mConditions.isXCHMALCVale &&
+                                               mConditions.isXAMANeutural &&
+                                               mConditions.isXCHLHSCMCHHSame &&
+                                               mConditions.isXCHMASCUnderMin) &&
+                                              (
+                                                  //
+                                                  mConditions.isXTSCurrentMax
+                                                  //
+                                                  ||
+                                                  //
+                                                  mConditions.isXCHMASCCrossedUnderMin
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -38850,9 +38871,7 @@ bool XUSPY5XCHMACCHasShortSignal()
                                                mConditions.isXCHMAMCFastUnderSlow) &&
                                               (
                                                   //
-                                                  (mConditions.isXCHMASCPeak &&
-                                                   mConditions.isXCHMASCUnderMin &&
-                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  mConditions.isXTSCurrentCrossedOverNearest
                                                   //
                                                   )
                                               //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 2ee8669d..d944da67 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 Shorts Stopouts in AMarkets-Demo ...
+Resolve XUSPY5 XCHMACC All Shorts Stopouts in ErranteSC ...
 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 d4771c73..02aa762e 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -38368,10 +38368,21 @@ bool XUSPY5XCHMACCHasShortSignal()
                                           mConditions.isXCHMAMCFastUnderSlow) &&
                                          (
                                              //
-                                             (mConditions.isXCHMALCVale &&
-                                              mConditions.isXTSCurrentMin &&
-                                              mConditions.isXCHMASCUnderMin &&
-                                              mConditions.isXTSCurrentCrossedUnderNearest)
+                                             ((mConditions.isXCHMALCVale &&
+                                               mConditions.isXCHMASCUnderMin) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTSCurrentOverFarest &&
+                                                   mConditions.isXTSCurrentCrossedUnderNearest)
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXTSCurrentMin &&
+                                                   mConditions.isXTSCurrentCrossedUnderNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -38729,11 +38740,21 @@ bool XUSPY5XCHMACCHasShortSignal()
                                         (mConditions.isXTDBullCrossedOverBear &&
                                          (
                                              //
-                                             (mConditions.isXCHMALCVale &&
-                                              mConditions.isXAMANeutural &&
-                                              mConditions.isXCHLHSCMCHHSame &&
-                                              mConditions.isXCHMASCUnderMin &&
-                                              mConditions.isXCHMASCCrossedUnderMin)
+                                             ((mConditions.isXCHMALCVale &&
+                                               mConditions.isXAMANeutural &&
+                                               mConditions.isXCHLHSCMCHHSame &&
+                                               mConditions.isXCHMASCUnderMin) &&
+                                              (
+                                                  //
+                                                  mConditions.isXTSCurrentMax
+                                                  //
+                                                  ||
+                                                  //
+                                                  mConditions.isXCHMASCCrossedUnderMin
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -38850,9 +38871,7 @@ bool XUSPY5XCHMACCHasShortSignal()
                                                mConditions.isXCHMAMCFastUnderSlow) &&
                                               (
                                                   //
-                                                  (mConditions.isXCHMASCPeak &&
-                                                   mConditions.isXCHMASCUnderMin &&
-                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  mConditions.isXTSCurrentCrossedOverNearest
                                                   //
                                                   )
                                               //
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index d4771c73..02aa762e 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -38368,10 +38368,21 @@ bool XUSPY5XCHMACCHasShortSignal()
                                           mConditions.isXCHMAMCFastUnderSlow) &&
                                          (
                                              //
-                                             (mConditions.isXCHMALCVale &&
-                                              mConditions.isXTSCurrentMin &&
-                                              mConditions.isXCHMASCUnderMin &&
-                                              mConditions.isXTSCurrentCrossedUnderNearest)
+                                             ((mConditions.isXCHMALCVale &&
+                                               mConditions.isXCHMASCUnderMin) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTSCurrentOverFarest &&
+                                                   mConditions.isXTSCurrentCrossedUnderNearest)
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXTSCurrentMin &&
+                                                   mConditions.isXTSCurrentCrossedUnderNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -38729,11 +38740,21 @@ bool XUSPY5XCHMACCHasShortSignal()
                                         (mConditions.isXTDBullCrossedOverBear &&
                                          (
                                              //
-                                             (mConditions.isXCHMALCVale &&
-                                              mConditions.isXAMANeutural &&
-                                              mConditions.isXCHLHSCMCHHSame &&
-                                              mConditions.isXCHMASCUnderMin &&
-                                              mConditions.isXCHMASCCrossedUnderMin)
+                                             ((mConditions.isXCHMALCVale &&
+                                               mConditions.isXAMANeutural &&
+                                               mConditions.isXCHLHSCMCHHSame &&
+                                               mConditions.isXCHMASCUnderMin) &&
+                                              (
+                                                  //
+                                                  mConditions.isXTSCurrentMax
+                                                  //
+                                                  ||
+                                                  //
+                                                  mConditions.isXCHMASCCrossedUnderMin
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -38850,9 +38871,7 @@ bool XUSPY5XCHMACCHasShortSignal()
                                                mConditions.isXCHMAMCFastUnderSlow) &&
                                               (
                                                   //
-                                                  (mConditions.isXCHMASCPeak &&
-                                                   mConditions.isXCHMASCUnderMin &&
-                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  mConditions.isXTSCurrentCrossedOverNearest
                                                   //
                                                   )
                                               //