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 702f4270..7b276c1b 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -38308,10 +38308,21 @@ bool XUSPY5XCHMACCHasShortSignal()
                                    (mConditions.isXTDBullOverBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCVale &&
-                                         mConditions.isXTSCurrentMin &&
-                                         mConditions.isXLHHHIncreased &&
-                                         mConditions.isXLHPriceCrossedUnderSignal)
+                                        ((mConditions.isXCHMALCVale &&
+                                          mConditions.isXLHHHIncreased &&
+                                          mConditions.isXLHPriceCrossedUnderSignal) &&
+                                         (
+                                             //
+                                             mConditions.isXTSCurrentMin
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentOverFarest &&
+                                              mConditions.isXTSCurrentCrossedOverFarest)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -38988,7 +38999,26 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMALCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        (mConditions.isXTSCurrentOverNearest &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMASCPeak &&
+                                              mConditions.isXCHMALCVale &&
+                                              mConditions.isXTMNeutural &&
+                                              mConditions.isXAMANeutural &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -39355,6 +39385,33 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Stop Outs ...
+                              // HH Same In Length ...
+                              // Price In Signal Range ...
+                              // All Neutural ...
+                              ((mConditions.isXTMNeutural &&
+                                mConditions.isXAMANeutural) &&
+                               (
+                                   //
+                                   (mConditions.isXTDBullCrossedUnderBear &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXCHLHSCMCLLSame &&
+                                         mConditions.isXCHMASCUnderMin)
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 27cb2c92..008db358 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 Alpari ...
+Resolve XUSPY5 XCHMACC All Stopouts in All Markets ...
 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 702f4270..7b276c1b 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -38308,10 +38308,21 @@ bool XUSPY5XCHMACCHasShortSignal()
                                    (mConditions.isXTDBullOverBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCVale &&
-                                         mConditions.isXTSCurrentMin &&
-                                         mConditions.isXLHHHIncreased &&
-                                         mConditions.isXLHPriceCrossedUnderSignal)
+                                        ((mConditions.isXCHMALCVale &&
+                                          mConditions.isXLHHHIncreased &&
+                                          mConditions.isXLHPriceCrossedUnderSignal) &&
+                                         (
+                                             //
+                                             mConditions.isXTSCurrentMin
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentOverFarest &&
+                                              mConditions.isXTSCurrentCrossedOverFarest)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -38988,7 +38999,26 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMALCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        (mConditions.isXTSCurrentOverNearest &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMASCPeak &&
+                                              mConditions.isXCHMALCVale &&
+                                              mConditions.isXTMNeutural &&
+                                              mConditions.isXAMANeutural &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -39355,6 +39385,33 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Stop Outs ...
+                              // HH Same In Length ...
+                              // Price In Signal Range ...
+                              // All Neutural ...
+                              ((mConditions.isXTMNeutural &&
+                                mConditions.isXAMANeutural) &&
+                               (
+                                   //
+                                   (mConditions.isXTDBullCrossedUnderBear &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXCHLHSCMCLLSame &&
+                                         mConditions.isXCHMASCUnderMin)
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
diff --git a/Projects/XUSPY5/Settings/XCHMACC.set b/Projects/XUSPY5/Settings/XCHMACC.set
index abdb03d7..c9b53a14 100644
Binary files a/Projects/XUSPY5/Settings/XCHMACC.set and b/Projects/XUSPY5/Settings/XCHMACC.set differ
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 702f4270..7b276c1b 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -38308,10 +38308,21 @@ bool XUSPY5XCHMACCHasShortSignal()
                                    (mConditions.isXTDBullOverBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMALCVale &&
-                                         mConditions.isXTSCurrentMin &&
-                                         mConditions.isXLHHHIncreased &&
-                                         mConditions.isXLHPriceCrossedUnderSignal)
+                                        ((mConditions.isXCHMALCVale &&
+                                          mConditions.isXLHHHIncreased &&
+                                          mConditions.isXLHPriceCrossedUnderSignal) &&
+                                         (
+                                             //
+                                             mConditions.isXTSCurrentMin
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTSCurrentOverFarest &&
+                                              mConditions.isXTSCurrentCrossedOverFarest)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -38988,7 +38999,26 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMALCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        (mConditions.isXTSCurrentOverNearest &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMASCPeak &&
+                                              mConditions.isXCHMALCVale &&
+                                              mConditions.isXTMNeutural &&
+                                              mConditions.isXAMANeutural &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXTSCurrentCrossedOverNearest)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -39355,6 +39385,33 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Stop Outs ...
+                              // HH Same In Length ...
+                              // Price In Signal Range ...
+                              // All Neutural ...
+                              ((mConditions.isXTMNeutural &&
+                                mConditions.isXAMANeutural) &&
+                               (
+                                   //
+                                   (mConditions.isXTDBullCrossedUnderBear &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXCHLHSCMCLLSame &&
+                                         mConditions.isXCHMASCUnderMin)
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )