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 bdee5904..6b3f21dd 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -48017,6 +48017,30 @@ bool XUSPY5XCHMACCHasShortSignal()
                                     //
                                     )
                                    //
+                                   ||
+                                   //
+                                   ((mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear) &&
+                                    (
+                                        //
+                                        ((mConditions.isXCHMALCVale &&
+                                          mConditions.isXTSCurrentMin &&
+                                          mConditions.isXCHLHSCMCLLSame &&
+                                          mConditions.isXCHMASCUnderMin &&
+                                          mConditions.isXTSCurrentCrossedUnderNearest) &&
+                                         (
+                                             //
+                                             (mConditions.isXTMNeutural &&
+                                              mConditions.isXAMAStartBearish)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
                                    )
                                //
                                )
@@ -48254,6 +48278,33 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Guard Attacks ...
+                              // Both HH and LL Same In Length ...
+                              // Price Under Signal ...
+                              // All Bearish ...
+                              ((mConditions.isXTMBearish &&
+                                mConditions.isXAMABearish) &&
+                               (
+                                   //
+                                   ((mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear) &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXCHMASCUnderMin)
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
@@ -48502,6 +48553,36 @@ bool XUSPY5XCHMACCHasShortSignal()
                                    //
                                    ||
                                    //
+                                   (mConditions.isXTDBullCrossedOverBear &&
+                                    (
+                                        //
+                                        ((!mConditions.isXCHMASCTrendsUp &&
+                                          !mConditions.isXCHMASCTrendsDown &&
+                                          mConditions.isXCHMASCFastUnderSlow) &&
+                                         (
+                                             //
+                                             ((mConditions.isXCHMALCVale &&
+                                               mConditions.isXTSCurrentMin &&
+                                               mConditions.isXCHLHMCLCLLSame) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTMNeutural &&
+                                                   mConditions.isXAMABullish)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   ||
+                                   //
                                    ((mConditions.isXTDBullUnderBear &&
                                      mConditions.isXTDSignalUnderBear) &&
                                     (
@@ -49350,10 +49431,20 @@ bool XUSPY5XCHMACCHasShortSignal()
                                           mConditions.isXAMABearish) &&
                                          (
                                              //
-                                             (mConditions.isXTSAllSame &&
-                                              mConditions.isXCHLHSameLLs &&
-                                              mConditions.isXCHMALCVale &&
-                                              mConditions.isXCHMASCUnderMin)
+                                             ((mConditions.isXCHLHSameLLs &&
+                                               mConditions.isXCHMALCVale &&
+                                               mConditions.isXCHMASCUnderMin) &&
+                                              (
+                                                  //
+                                                  mConditions.isXTSAllSame
+                                                  //
+                                                  ||
+                                                  //
+                                                  mConditions.isXTSCurrentMin
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -49368,6 +49459,24 @@ bool XUSPY5XCHMACCHasShortSignal()
                                    ((mConditions.isXTMBearish &&
                                      mConditions.isXAMABearish) &&
                                     (
+                                        //
+                                        (mConditions.isXTDBullOverBear &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXCHLHSameLLs &&
+                                              mConditions.isXTSCurrentMin &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXLHLowAttachedLL &&
+                                              mConditions.isXTSCurrentCrossedUnderFarest &&
+                                              mConditions.isXTSCurrentCrossedUnderNearest &&
+                                              mConditions.isXTSCurrentCrossedUnderMediest)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
                                         //
                                         (mConditions.isXTDBullCrossedUnderBear &&
                                          (
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 9cb60230..c6692ca6 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 HFMarkets ...
+Resolve XUSPY5 XCHMACC All Shorts Guard Attacks in AMarkets-Demo ...
 
 
 
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 bdee5904..6b3f21dd 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -48017,6 +48017,30 @@ bool XUSPY5XCHMACCHasShortSignal()
                                     //
                                     )
                                    //
+                                   ||
+                                   //
+                                   ((mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear) &&
+                                    (
+                                        //
+                                        ((mConditions.isXCHMALCVale &&
+                                          mConditions.isXTSCurrentMin &&
+                                          mConditions.isXCHLHSCMCLLSame &&
+                                          mConditions.isXCHMASCUnderMin &&
+                                          mConditions.isXTSCurrentCrossedUnderNearest) &&
+                                         (
+                                             //
+                                             (mConditions.isXTMNeutural &&
+                                              mConditions.isXAMAStartBearish)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
                                    )
                                //
                                )
@@ -48254,6 +48278,33 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Guard Attacks ...
+                              // Both HH and LL Same In Length ...
+                              // Price Under Signal ...
+                              // All Bearish ...
+                              ((mConditions.isXTMBearish &&
+                                mConditions.isXAMABearish) &&
+                               (
+                                   //
+                                   ((mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear) &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXCHMASCUnderMin)
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
@@ -48502,6 +48553,36 @@ bool XUSPY5XCHMACCHasShortSignal()
                                    //
                                    ||
                                    //
+                                   (mConditions.isXTDBullCrossedOverBear &&
+                                    (
+                                        //
+                                        ((!mConditions.isXCHMASCTrendsUp &&
+                                          !mConditions.isXCHMASCTrendsDown &&
+                                          mConditions.isXCHMASCFastUnderSlow) &&
+                                         (
+                                             //
+                                             ((mConditions.isXCHMALCVale &&
+                                               mConditions.isXTSCurrentMin &&
+                                               mConditions.isXCHLHMCLCLLSame) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTMNeutural &&
+                                                   mConditions.isXAMABullish)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   ||
+                                   //
                                    ((mConditions.isXTDBullUnderBear &&
                                      mConditions.isXTDSignalUnderBear) &&
                                     (
@@ -49350,10 +49431,20 @@ bool XUSPY5XCHMACCHasShortSignal()
                                           mConditions.isXAMABearish) &&
                                          (
                                              //
-                                             (mConditions.isXTSAllSame &&
-                                              mConditions.isXCHLHSameLLs &&
-                                              mConditions.isXCHMALCVale &&
-                                              mConditions.isXCHMASCUnderMin)
+                                             ((mConditions.isXCHLHSameLLs &&
+                                               mConditions.isXCHMALCVale &&
+                                               mConditions.isXCHMASCUnderMin) &&
+                                              (
+                                                  //
+                                                  mConditions.isXTSAllSame
+                                                  //
+                                                  ||
+                                                  //
+                                                  mConditions.isXTSCurrentMin
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -49368,6 +49459,24 @@ bool XUSPY5XCHMACCHasShortSignal()
                                    ((mConditions.isXTMBearish &&
                                      mConditions.isXAMABearish) &&
                                     (
+                                        //
+                                        (mConditions.isXTDBullOverBear &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXCHLHSameLLs &&
+                                              mConditions.isXTSCurrentMin &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXLHLowAttachedLL &&
+                                              mConditions.isXTSCurrentCrossedUnderFarest &&
+                                              mConditions.isXTSCurrentCrossedUnderNearest &&
+                                              mConditions.isXTSCurrentCrossedUnderMediest)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
                                         //
                                         (mConditions.isXTDBullCrossedUnderBear &&
                                          (
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index bdee5904..6b3f21dd 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -48017,6 +48017,30 @@ bool XUSPY5XCHMACCHasShortSignal()
                                     //
                                     )
                                    //
+                                   ||
+                                   //
+                                   ((mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear) &&
+                                    (
+                                        //
+                                        ((mConditions.isXCHMALCVale &&
+                                          mConditions.isXTSCurrentMin &&
+                                          mConditions.isXCHLHSCMCLLSame &&
+                                          mConditions.isXCHMASCUnderMin &&
+                                          mConditions.isXTSCurrentCrossedUnderNearest) &&
+                                         (
+                                             //
+                                             (mConditions.isXTMNeutural &&
+                                              mConditions.isXAMAStartBearish)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
                                    )
                                //
                                )
@@ -48254,6 +48278,33 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Guard Attacks ...
+                              // Both HH and LL Same In Length ...
+                              // Price Under Signal ...
+                              // All Bearish ...
+                              ((mConditions.isXTMBearish &&
+                                mConditions.isXAMABearish) &&
+                               (
+                                   //
+                                   ((mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXTDSignalUnderBear) &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXCHMASCUnderMin)
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
@@ -48502,6 +48553,36 @@ bool XUSPY5XCHMACCHasShortSignal()
                                    //
                                    ||
                                    //
+                                   (mConditions.isXTDBullCrossedOverBear &&
+                                    (
+                                        //
+                                        ((!mConditions.isXCHMASCTrendsUp &&
+                                          !mConditions.isXCHMASCTrendsDown &&
+                                          mConditions.isXCHMASCFastUnderSlow) &&
+                                         (
+                                             //
+                                             ((mConditions.isXCHMALCVale &&
+                                               mConditions.isXTSCurrentMin &&
+                                               mConditions.isXCHLHMCLCLLSame) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTMNeutural &&
+                                                   mConditions.isXAMABullish)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   ||
+                                   //
                                    ((mConditions.isXTDBullUnderBear &&
                                      mConditions.isXTDSignalUnderBear) &&
                                     (
@@ -49350,10 +49431,20 @@ bool XUSPY5XCHMACCHasShortSignal()
                                           mConditions.isXAMABearish) &&
                                          (
                                              //
-                                             (mConditions.isXTSAllSame &&
-                                              mConditions.isXCHLHSameLLs &&
-                                              mConditions.isXCHMALCVale &&
-                                              mConditions.isXCHMASCUnderMin)
+                                             ((mConditions.isXCHLHSameLLs &&
+                                               mConditions.isXCHMALCVale &&
+                                               mConditions.isXCHMASCUnderMin) &&
+                                              (
+                                                  //
+                                                  mConditions.isXTSAllSame
+                                                  //
+                                                  ||
+                                                  //
+                                                  mConditions.isXTSCurrentMin
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              )
                                          //
@@ -49368,6 +49459,24 @@ bool XUSPY5XCHMACCHasShortSignal()
                                    ((mConditions.isXTMBearish &&
                                      mConditions.isXAMABearish) &&
                                     (
+                                        //
+                                        (mConditions.isXTDBullOverBear &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXCHLHSameLLs &&
+                                              mConditions.isXTSCurrentMin &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXLHLowAttachedLL &&
+                                              mConditions.isXTSCurrentCrossedUnderFarest &&
+                                              mConditions.isXTSCurrentCrossedUnderNearest &&
+                                              mConditions.isXTSCurrentCrossedUnderMediest)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
                                         //
                                         (mConditions.isXTDBullCrossedUnderBear &&
                                          (