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 85de685d..21fee826 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -48109,6 +48109,43 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Guard Attacks ...
+                              // Both HH and LL Same In Length ...
+                              // Price In Signal Range ...
+                              // All Neutural ...
+                              ((mConditions.isXTMNeutural &&
+                                mConditions.isXAMANeutural) &&
+                               (
+                                   //
+                                   ((mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear) &&
+                                    (
+                                        //
+                                        ((mConditions.isXCHMALCVale &&
+                                          mConditions.isXTSCurrentMin &&
+                                          mConditions.isXCHLHMCLCLLSame &&
+                                          mConditions.isXCHMASCUnderMin &&
+                                          mConditions.isXTSCurrentCrossedUnderNearest) &&
+                                         (
+                                             //
+                                             (mConditions.isXTMEndBearish &&
+                                              mConditions.isXAMAEndBearish)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
@@ -48699,6 +48736,36 @@ bool XUSPY5XCHMACCHasShortSignal()
                                                    //
                                                    )
                                                   //
+                                                  ||
+                                                  //
+                                                  ((!mConditions.isXCHMASCTrendsUp &&
+                                                    !mConditions.isXCHMASCTrendsDown &&
+                                                    mConditions.isXCHMASCFastUnderSlow) &&
+                                                   (
+                                                       //
+                                                       (
+                                                           mConditions.isXTSCurrentMax &&
+                                                           (
+                                                               //
+                                                               ((mConditions.isXTMBearish &&
+                                                                 mConditions.isXAMABearish) &&
+                                                                (
+                                                                    //
+                                                                    (mConditions.isXTDBullUnderBear &&
+                                                                     mConditions.isXTDSignalUnderBear)
+                                                                    //
+                                                                    )
+                                                                //
+                                                                )
+                                                               //
+                                                               )
+                                                           //
+                                                           )
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
                                                   )
                                               //
                                               )
@@ -49352,6 +49419,29 @@ bool XUSPY5XCHMACCHasShortSignal()
                                               //
                                               )
                                              //
+                                             ||
+                                             //
+                                             ((!mConditions.isXCHMASCTrendsUp &&
+                                               !mConditions.isXCHMASCTrendsDown &&
+                                               mConditions.isXCHMASCFastUnderSlow) &&
+                                              (
+                                                  //
+                                                  ((mConditions.isXCHMAMCVale &&
+                                                    mConditions.isXTSCurrentMin &&
+                                                    mConditions.isXCHMASCUnderMin) &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXTMNeutural &&
+                                                        mConditions.isXTMEndBearish)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
                                              )
                                          //
                                          )
@@ -49905,8 +49995,9 @@ bool XUSPY5XCHMACCHasShortSignal()
                                         (mConditions.isXTDBullOverBear &&
                                          (
                                              //
-                                             ((mConditions.isXCHLHSameLLs &&
-                                               mConditions.isXCHMASCUnderMin) &&
+                                             ((mConditions.isXCHMASCUnderMin &&
+                                               (mConditions.isXCHLHSameLLs ||
+                                                mConditions.isXCHLHSCMCLLSame)) &&
                                               (
                                                   //
                                                   (mConditions.isXTMStartBearish &&
@@ -50599,6 +50690,29 @@ bool XUSPY5XCHMACCHasShortSignal()
                                     //
                                     )
                                    //
+                                   ||
+                                   //
+                                   ((mConditions.isXTMBearish &&
+                                     mConditions.isXAMABearish) &&
+                                    (
+                                        //
+                                        ((mConditions.isXTDBullUnderBear &&
+                                          mConditions.isXTDSignalUnderBear) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXCHLHSameLLs &&
+                                              mConditions.isXTSCurrentMin &&
+                                              mConditions.isXCHMASCUnderMin)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
                                    )
                                //
                                )
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 9ab63172..6eb88c9b 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -43,7 +43,7 @@ XCHMACC
 --------
 Resolve XUSPY5 XCHMACC All Stopouts in All Markets ...
 Resolve XUSPY5 XCHMACC All Critical Guard Attacks in All Markets ...
-Resolve XUSPY5 XCHMACC All Shorts Guard Attacks in IFCMarkets ...
+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 85de685d..21fee826 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -48109,6 +48109,43 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Guard Attacks ...
+                              // Both HH and LL Same In Length ...
+                              // Price In Signal Range ...
+                              // All Neutural ...
+                              ((mConditions.isXTMNeutural &&
+                                mConditions.isXAMANeutural) &&
+                               (
+                                   //
+                                   ((mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear) &&
+                                    (
+                                        //
+                                        ((mConditions.isXCHMALCVale &&
+                                          mConditions.isXTSCurrentMin &&
+                                          mConditions.isXCHLHMCLCLLSame &&
+                                          mConditions.isXCHMASCUnderMin &&
+                                          mConditions.isXTSCurrentCrossedUnderNearest) &&
+                                         (
+                                             //
+                                             (mConditions.isXTMEndBearish &&
+                                              mConditions.isXAMAEndBearish)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
@@ -48699,6 +48736,36 @@ bool XUSPY5XCHMACCHasShortSignal()
                                                    //
                                                    )
                                                   //
+                                                  ||
+                                                  //
+                                                  ((!mConditions.isXCHMASCTrendsUp &&
+                                                    !mConditions.isXCHMASCTrendsDown &&
+                                                    mConditions.isXCHMASCFastUnderSlow) &&
+                                                   (
+                                                       //
+                                                       (
+                                                           mConditions.isXTSCurrentMax &&
+                                                           (
+                                                               //
+                                                               ((mConditions.isXTMBearish &&
+                                                                 mConditions.isXAMABearish) &&
+                                                                (
+                                                                    //
+                                                                    (mConditions.isXTDBullUnderBear &&
+                                                                     mConditions.isXTDSignalUnderBear)
+                                                                    //
+                                                                    )
+                                                                //
+                                                                )
+                                                               //
+                                                               )
+                                                           //
+                                                           )
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
                                                   )
                                               //
                                               )
@@ -49352,6 +49419,29 @@ bool XUSPY5XCHMACCHasShortSignal()
                                               //
                                               )
                                              //
+                                             ||
+                                             //
+                                             ((!mConditions.isXCHMASCTrendsUp &&
+                                               !mConditions.isXCHMASCTrendsDown &&
+                                               mConditions.isXCHMASCFastUnderSlow) &&
+                                              (
+                                                  //
+                                                  ((mConditions.isXCHMAMCVale &&
+                                                    mConditions.isXTSCurrentMin &&
+                                                    mConditions.isXCHMASCUnderMin) &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXTMNeutural &&
+                                                        mConditions.isXTMEndBearish)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
                                              )
                                          //
                                          )
@@ -49905,8 +49995,9 @@ bool XUSPY5XCHMACCHasShortSignal()
                                         (mConditions.isXTDBullOverBear &&
                                          (
                                              //
-                                             ((mConditions.isXCHLHSameLLs &&
-                                               mConditions.isXCHMASCUnderMin) &&
+                                             ((mConditions.isXCHMASCUnderMin &&
+                                               (mConditions.isXCHLHSameLLs ||
+                                                mConditions.isXCHLHSCMCLLSame)) &&
                                               (
                                                   //
                                                   (mConditions.isXTMStartBearish &&
@@ -50599,6 +50690,29 @@ bool XUSPY5XCHMACCHasShortSignal()
                                     //
                                     )
                                    //
+                                   ||
+                                   //
+                                   ((mConditions.isXTMBearish &&
+                                     mConditions.isXAMABearish) &&
+                                    (
+                                        //
+                                        ((mConditions.isXTDBullUnderBear &&
+                                          mConditions.isXTDSignalUnderBear) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXCHLHSameLLs &&
+                                              mConditions.isXTSCurrentMin &&
+                                              mConditions.isXCHMASCUnderMin)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
                                    )
                                //
                                )
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 85de685d..21fee826 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -48109,6 +48109,43 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Guard Attacks ...
+                              // Both HH and LL Same In Length ...
+                              // Price In Signal Range ...
+                              // All Neutural ...
+                              ((mConditions.isXTMNeutural &&
+                                mConditions.isXAMANeutural) &&
+                               (
+                                   //
+                                   ((mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear) &&
+                                    (
+                                        //
+                                        ((mConditions.isXCHMALCVale &&
+                                          mConditions.isXTSCurrentMin &&
+                                          mConditions.isXCHLHMCLCLLSame &&
+                                          mConditions.isXCHMASCUnderMin &&
+                                          mConditions.isXTSCurrentCrossedUnderNearest) &&
+                                         (
+                                             //
+                                             (mConditions.isXTMEndBearish &&
+                                              mConditions.isXAMAEndBearish)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
@@ -48699,6 +48736,36 @@ bool XUSPY5XCHMACCHasShortSignal()
                                                    //
                                                    )
                                                   //
+                                                  ||
+                                                  //
+                                                  ((!mConditions.isXCHMASCTrendsUp &&
+                                                    !mConditions.isXCHMASCTrendsDown &&
+                                                    mConditions.isXCHMASCFastUnderSlow) &&
+                                                   (
+                                                       //
+                                                       (
+                                                           mConditions.isXTSCurrentMax &&
+                                                           (
+                                                               //
+                                                               ((mConditions.isXTMBearish &&
+                                                                 mConditions.isXAMABearish) &&
+                                                                (
+                                                                    //
+                                                                    (mConditions.isXTDBullUnderBear &&
+                                                                     mConditions.isXTDSignalUnderBear)
+                                                                    //
+                                                                    )
+                                                                //
+                                                                )
+                                                               //
+                                                               )
+                                                           //
+                                                           )
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
                                                   )
                                               //
                                               )
@@ -49352,6 +49419,29 @@ bool XUSPY5XCHMACCHasShortSignal()
                                               //
                                               )
                                              //
+                                             ||
+                                             //
+                                             ((!mConditions.isXCHMASCTrendsUp &&
+                                               !mConditions.isXCHMASCTrendsDown &&
+                                               mConditions.isXCHMASCFastUnderSlow) &&
+                                              (
+                                                  //
+                                                  ((mConditions.isXCHMAMCVale &&
+                                                    mConditions.isXTSCurrentMin &&
+                                                    mConditions.isXCHMASCUnderMin) &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXTMNeutural &&
+                                                        mConditions.isXTMEndBearish)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
                                              )
                                          //
                                          )
@@ -49905,8 +49995,9 @@ bool XUSPY5XCHMACCHasShortSignal()
                                         (mConditions.isXTDBullOverBear &&
                                          (
                                              //
-                                             ((mConditions.isXCHLHSameLLs &&
-                                               mConditions.isXCHMASCUnderMin) &&
+                                             ((mConditions.isXCHMASCUnderMin &&
+                                               (mConditions.isXCHLHSameLLs ||
+                                                mConditions.isXCHLHSCMCLLSame)) &&
                                               (
                                                   //
                                                   (mConditions.isXTMStartBearish &&
@@ -50599,6 +50690,29 @@ bool XUSPY5XCHMACCHasShortSignal()
                                     //
                                     )
                                    //
+                                   ||
+                                   //
+                                   ((mConditions.isXTMBearish &&
+                                     mConditions.isXAMABearish) &&
+                                    (
+                                        //
+                                        ((mConditions.isXTDBullUnderBear &&
+                                          mConditions.isXTDSignalUnderBear) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXCHLHSameLLs &&
+                                              mConditions.isXTSCurrentMin &&
+                                              mConditions.isXCHMASCUnderMin)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
                                    )
                                //
                                )