diff --git a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index 67d3c61a..2bfcf7b4 100644
--- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -14230,6 +14230,37 @@ bool XUSCHF5XCHMACCHasShortSignal()
             ||
             //
             (
+                //
+                (mConditions.isXTSCurrentOverMediest &&
+                 (
+                     //
+                     (((mConditions.isXTMNeutural &&
+                        mConditions.isXAMANeutural) ||
+                       (mConditions.isXTMEndBearish &&
+                        mConditions.isXAMAEndBearish)) &&
+                      (
+                          //
+                          ((mConditions.isXCHMALCTrendsDown &&
+                            mConditions.isXCHMALCFastUnderSlow) &&
+                           (
+                               //
+                               (mConditions.isXCHLHSCMCLLSame &&
+                                mConditions.isXCHMASCUnderMin &&
+                                mConditions.isXTSCurrentCrossedOverMediest)
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
+                      //
+                      )
+                     //
+                     )
+                 //
+                 )
+                //
+                ||
                 //
                 (mConditions.isXTDBullOverBear &&
                  (
@@ -14241,6 +14272,13 @@ bool XUSCHF5XCHMACCHasShortSignal()
                      //
                      ||
                      //
+                     (mConditions.isXTSCurrentOverFarest &&
+                      mConditions.isXTSCurrentOverNearest &&
+                      mConditions.isXTDSignalCrossedOverBear &&
+                      mConditions.isXTSCurrentCrossedOverNearest)
+                     //
+                     ||
+                     //
                      ((mConditions.isXCHMALCTrendsDown &&
                        mConditions.isXCHMALCFastUnderSlow) &&
                       (
@@ -14249,10 +14287,20 @@ bool XUSCHF5XCHMACCHasShortSignal()
                             mConditions.isXAMANeutural) &&
                            (
                                //
-                               (mConditions.isXCHMALCVale &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXLHLLDecreased &&
-                                mConditions.isXCHMASCUnderMin)
+                               ((mConditions.isXCHMALCVale &&
+                                 mConditions.isXLHLLDecreased &&
+                                 mConditions.isXCHMASCUnderMin) &&
+                                (
+                                    //
+                                    mConditions.isXTSCurrentMin
+                                    //
+                                    ||
+                                    //
+                                    mConditions.isXTSCurrentOverFarest
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -14313,6 +14361,33 @@ bool XUSCHF5XCHMACCHasShortSignal()
                       //
                       )
                      //
+                     ||
+                     //
+                     (mConditions.isXTSCurrentOverFarest &&
+                      (
+                          //
+                          (mConditions.isXCHMALCVale &&
+                           mConditions.isXAMANeutural &&
+                           mConditions.isXAMAEndBullish)
+                          //
+                          ||
+                          //
+                          ((mConditions.isXTMNeutural &&
+                            mConditions.isXAMANeutural) &&
+                           (
+                               //
+                               (mConditions.isXCHMALCVale &&
+                                mConditions.isXTDSignalVale &&
+                                mConditions.isXTDBullishVale)
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
+                      //
+                      )
+                     //
                      )
                  //
                  )
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index cfa18e1b..0cb0d5cc 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -42,7 +42,7 @@ XCHMACC
 --------
 Resolve XUSCHF5 XCHMACC All Stopouts in All Markets ...
 Resolve XUSCHF5 XCHMACC Longs All Critical Guard Attacks in All Markets ...
-Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in GrowthNext ...
+Resolve XUSCHF5 XCHMACC Shorts All Critical Guard Attacks in OANDA ...
 Resolve XUSCHF5 XCHMACC All Guard Attacks in All Markets ...
 
 
diff --git a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index 67d3c61a..2bfcf7b4 100644
--- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -14230,6 +14230,37 @@ bool XUSCHF5XCHMACCHasShortSignal()
             ||
             //
             (
+                //
+                (mConditions.isXTSCurrentOverMediest &&
+                 (
+                     //
+                     (((mConditions.isXTMNeutural &&
+                        mConditions.isXAMANeutural) ||
+                       (mConditions.isXTMEndBearish &&
+                        mConditions.isXAMAEndBearish)) &&
+                      (
+                          //
+                          ((mConditions.isXCHMALCTrendsDown &&
+                            mConditions.isXCHMALCFastUnderSlow) &&
+                           (
+                               //
+                               (mConditions.isXCHLHSCMCLLSame &&
+                                mConditions.isXCHMASCUnderMin &&
+                                mConditions.isXTSCurrentCrossedOverMediest)
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
+                      //
+                      )
+                     //
+                     )
+                 //
+                 )
+                //
+                ||
                 //
                 (mConditions.isXTDBullOverBear &&
                  (
@@ -14241,6 +14272,13 @@ bool XUSCHF5XCHMACCHasShortSignal()
                      //
                      ||
                      //
+                     (mConditions.isXTSCurrentOverFarest &&
+                      mConditions.isXTSCurrentOverNearest &&
+                      mConditions.isXTDSignalCrossedOverBear &&
+                      mConditions.isXTSCurrentCrossedOverNearest)
+                     //
+                     ||
+                     //
                      ((mConditions.isXCHMALCTrendsDown &&
                        mConditions.isXCHMALCFastUnderSlow) &&
                       (
@@ -14249,10 +14287,20 @@ bool XUSCHF5XCHMACCHasShortSignal()
                             mConditions.isXAMANeutural) &&
                            (
                                //
-                               (mConditions.isXCHMALCVale &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXLHLLDecreased &&
-                                mConditions.isXCHMASCUnderMin)
+                               ((mConditions.isXCHMALCVale &&
+                                 mConditions.isXLHLLDecreased &&
+                                 mConditions.isXCHMASCUnderMin) &&
+                                (
+                                    //
+                                    mConditions.isXTSCurrentMin
+                                    //
+                                    ||
+                                    //
+                                    mConditions.isXTSCurrentOverFarest
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -14313,6 +14361,33 @@ bool XUSCHF5XCHMACCHasShortSignal()
                       //
                       )
                      //
+                     ||
+                     //
+                     (mConditions.isXTSCurrentOverFarest &&
+                      (
+                          //
+                          (mConditions.isXCHMALCVale &&
+                           mConditions.isXAMANeutural &&
+                           mConditions.isXAMAEndBullish)
+                          //
+                          ||
+                          //
+                          ((mConditions.isXTMNeutural &&
+                            mConditions.isXAMANeutural) &&
+                           (
+                               //
+                               (mConditions.isXCHMALCVale &&
+                                mConditions.isXTDSignalVale &&
+                                mConditions.isXTDBullishVale)
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
+                      //
+                      )
+                     //
                      )
                  //
                  )
diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index 67d3c61a..2bfcf7b4 100644
--- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -14230,6 +14230,37 @@ bool XUSCHF5XCHMACCHasShortSignal()
             ||
             //
             (
+                //
+                (mConditions.isXTSCurrentOverMediest &&
+                 (
+                     //
+                     (((mConditions.isXTMNeutural &&
+                        mConditions.isXAMANeutural) ||
+                       (mConditions.isXTMEndBearish &&
+                        mConditions.isXAMAEndBearish)) &&
+                      (
+                          //
+                          ((mConditions.isXCHMALCTrendsDown &&
+                            mConditions.isXCHMALCFastUnderSlow) &&
+                           (
+                               //
+                               (mConditions.isXCHLHSCMCLLSame &&
+                                mConditions.isXCHMASCUnderMin &&
+                                mConditions.isXTSCurrentCrossedOverMediest)
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
+                      //
+                      )
+                     //
+                     )
+                 //
+                 )
+                //
+                ||
                 //
                 (mConditions.isXTDBullOverBear &&
                  (
@@ -14241,6 +14272,13 @@ bool XUSCHF5XCHMACCHasShortSignal()
                      //
                      ||
                      //
+                     (mConditions.isXTSCurrentOverFarest &&
+                      mConditions.isXTSCurrentOverNearest &&
+                      mConditions.isXTDSignalCrossedOverBear &&
+                      mConditions.isXTSCurrentCrossedOverNearest)
+                     //
+                     ||
+                     //
                      ((mConditions.isXCHMALCTrendsDown &&
                        mConditions.isXCHMALCFastUnderSlow) &&
                       (
@@ -14249,10 +14287,20 @@ bool XUSCHF5XCHMACCHasShortSignal()
                             mConditions.isXAMANeutural) &&
                            (
                                //
-                               (mConditions.isXCHMALCVale &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXLHLLDecreased &&
-                                mConditions.isXCHMASCUnderMin)
+                               ((mConditions.isXCHMALCVale &&
+                                 mConditions.isXLHLLDecreased &&
+                                 mConditions.isXCHMASCUnderMin) &&
+                                (
+                                    //
+                                    mConditions.isXTSCurrentMin
+                                    //
+                                    ||
+                                    //
+                                    mConditions.isXTSCurrentOverFarest
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -14313,6 +14361,33 @@ bool XUSCHF5XCHMACCHasShortSignal()
                       //
                       )
                      //
+                     ||
+                     //
+                     (mConditions.isXTSCurrentOverFarest &&
+                      (
+                          //
+                          (mConditions.isXCHMALCVale &&
+                           mConditions.isXAMANeutural &&
+                           mConditions.isXAMAEndBullish)
+                          //
+                          ||
+                          //
+                          ((mConditions.isXTMNeutural &&
+                            mConditions.isXAMANeutural) &&
+                           (
+                               //
+                               (mConditions.isXCHMALCVale &&
+                                mConditions.isXTDSignalVale &&
+                                mConditions.isXTDBullishVale)
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
+                      //
+                      )
+                     //
                      )
                  //
                  )