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 df6f7f77..ece44c1f 100644
--- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -7917,10 +7917,27 @@ bool XUSCHF5XCHMACCHasShortSignal()
                         mConditions.isXCHMAMCFastUnderSlow) &&
                        (
                            //
-                           (mConditions.isXTSCurrentMin &&
-                            mConditions.isXCHLHSCMCHHSame &&
-                            mConditions.isXTDBullCrossedUnderBear &&
-                            mConditions.isXTSCurrentCrossedUnderNearest)
+                           (mConditions.isXTDBullOverBear &&
+                            mConditions.isXTSCurrentOverFarest)
+                           //
+                           ||
+                           //
+                           (mConditions.isXTDBullCrossedUnderBear &&
+                            (
+                                //
+                                (mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish &&
+                                 mConditions.isXTSCurrentOverFarest)
+                                //
+                                ||
+                                //
+                                (mConditions.isXTSCurrentMin &&
+                                 mConditions.isXCHLHSCMCHHSame &&
+                                 mConditions.isXTSCurrentCrossedUnderNearest)
+                                //
+                                )
+                            //
+                            )
                            //
                            )
                        //
@@ -8019,7 +8036,30 @@ bool XUSCHF5XCHMACCHasShortSignal()
                        !mConditions.isXLHHHSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          ((mConditions.isXCHMAMCTrendsDown &&
+                            mConditions.isXCHMAMCFastUnderSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXLHHHDecreased &&
+                                     mConditions.isXTDBullOverBear &&
+                                     mConditions.isXTDSignalCrossedUnderBear &&
+                                     mConditions.isXLHPriceCrossedUnderSignal)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //
@@ -8079,13 +8119,37 @@ bool XUSCHF5XCHMACCHasShortSignal()
                             mConditions.isXCHMALCFastUnderSlow) &&
                            (
                                //
-                               (mConditions.isXTMBearish &&
-                                mConditions.isXAMABearish &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXLHLowAttachedLL &&
-                                mConditions.isXTDBullUnderBear &&
-                                mConditions.isXTDSignalUnderBear &&
-                                mConditions.isXTSCurrentUnderFarest)
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    ((mConditions.isXTDBullUnderBear &&
+                                      mConditions.isXTDSignalUnderBear) &&
+                                     (
+                                         //
+                                         (mConditions.isXLHLowAttachedLL &&
+                                          (
+                                              //
+                                              (mConditions.isXTSCurrentMin &&
+                                               mConditions.isXTSCurrentUnderFarest)
+                                              //
+                                              ||
+                                              //
+                                              (mConditions.isXTSAllSame &&
+                                               mConditions.isXCHLHSCMCLLSame &&
+                                               mConditions.isXCHMASCUnderMin)
+                                              //
+                                              )
+                                          //
+                                          )
+                                         //
+                                         )
+                                     //
+                                     )
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -8104,7 +8168,30 @@ bool XUSCHF5XCHMACCHasShortSignal()
                        !mConditions.isXLHLLSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          ((mConditions.isXTMBearish &&
+                            mConditions.isXAMABearish) &&
+                           (
+                               //
+                               ((mConditions.isXCHMASCTrendsUp &&
+                                 mConditions.isXCHMAMCTrendsUp &&
+                                 mConditions.isXCHMALCTrendsUp) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXCHLHSCMCLLSame &&
+                                     mConditions.isXCHMASCUnderMin &&
+                                     mConditions.isXTDBullCrossedUnderBear)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 2d8c3472..9e70ca68 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -13,6 +13,6 @@ Resolve XUSCHF5 XTAM Shorts All Stopouts in All Markets ...
 Resolve XUSCHF5 XSI Shorts All Stopouts in All Markets ...
 Resolve XUSCHF5 XTSFI Shorts All Stopouts in All Markets ...
 Resolve XUSCHF5 XOBDLH Shorts All Stopouts in All Markets ...
-Resolve XUSCHF5 XCHMACC Shorts All Stopouts in GrowthNext ...
+Resolve XUSCHF5 XCHMACC Shorts All Stopouts in OANDA ...
 Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in  ...
 Resolve XUSCHF5 XCHMAMN Shorts All Stopouts in  ...
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 df6f7f77..ece44c1f 100644
--- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -7917,10 +7917,27 @@ bool XUSCHF5XCHMACCHasShortSignal()
                         mConditions.isXCHMAMCFastUnderSlow) &&
                        (
                            //
-                           (mConditions.isXTSCurrentMin &&
-                            mConditions.isXCHLHSCMCHHSame &&
-                            mConditions.isXTDBullCrossedUnderBear &&
-                            mConditions.isXTSCurrentCrossedUnderNearest)
+                           (mConditions.isXTDBullOverBear &&
+                            mConditions.isXTSCurrentOverFarest)
+                           //
+                           ||
+                           //
+                           (mConditions.isXTDBullCrossedUnderBear &&
+                            (
+                                //
+                                (mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish &&
+                                 mConditions.isXTSCurrentOverFarest)
+                                //
+                                ||
+                                //
+                                (mConditions.isXTSCurrentMin &&
+                                 mConditions.isXCHLHSCMCHHSame &&
+                                 mConditions.isXTSCurrentCrossedUnderNearest)
+                                //
+                                )
+                            //
+                            )
                            //
                            )
                        //
@@ -8019,7 +8036,30 @@ bool XUSCHF5XCHMACCHasShortSignal()
                        !mConditions.isXLHHHSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          ((mConditions.isXCHMAMCTrendsDown &&
+                            mConditions.isXCHMAMCFastUnderSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXLHHHDecreased &&
+                                     mConditions.isXTDBullOverBear &&
+                                     mConditions.isXTDSignalCrossedUnderBear &&
+                                     mConditions.isXLHPriceCrossedUnderSignal)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //
@@ -8079,13 +8119,37 @@ bool XUSCHF5XCHMACCHasShortSignal()
                             mConditions.isXCHMALCFastUnderSlow) &&
                            (
                                //
-                               (mConditions.isXTMBearish &&
-                                mConditions.isXAMABearish &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXLHLowAttachedLL &&
-                                mConditions.isXTDBullUnderBear &&
-                                mConditions.isXTDSignalUnderBear &&
-                                mConditions.isXTSCurrentUnderFarest)
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    ((mConditions.isXTDBullUnderBear &&
+                                      mConditions.isXTDSignalUnderBear) &&
+                                     (
+                                         //
+                                         (mConditions.isXLHLowAttachedLL &&
+                                          (
+                                              //
+                                              (mConditions.isXTSCurrentMin &&
+                                               mConditions.isXTSCurrentUnderFarest)
+                                              //
+                                              ||
+                                              //
+                                              (mConditions.isXTSAllSame &&
+                                               mConditions.isXCHLHSCMCLLSame &&
+                                               mConditions.isXCHMASCUnderMin)
+                                              //
+                                              )
+                                          //
+                                          )
+                                         //
+                                         )
+                                     //
+                                     )
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -8104,7 +8168,30 @@ bool XUSCHF5XCHMACCHasShortSignal()
                        !mConditions.isXLHLLSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          ((mConditions.isXTMBearish &&
+                            mConditions.isXAMABearish) &&
+                           (
+                               //
+                               ((mConditions.isXCHMASCTrendsUp &&
+                                 mConditions.isXCHMAMCTrendsUp &&
+                                 mConditions.isXCHMALCTrendsUp) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXCHLHSCMCLLSame &&
+                                     mConditions.isXCHMASCUnderMin &&
+                                     mConditions.isXTDBullCrossedUnderBear)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //
diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index df6f7f77..ece44c1f 100644
--- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -7917,10 +7917,27 @@ bool XUSCHF5XCHMACCHasShortSignal()
                         mConditions.isXCHMAMCFastUnderSlow) &&
                        (
                            //
-                           (mConditions.isXTSCurrentMin &&
-                            mConditions.isXCHLHSCMCHHSame &&
-                            mConditions.isXTDBullCrossedUnderBear &&
-                            mConditions.isXTSCurrentCrossedUnderNearest)
+                           (mConditions.isXTDBullOverBear &&
+                            mConditions.isXTSCurrentOverFarest)
+                           //
+                           ||
+                           //
+                           (mConditions.isXTDBullCrossedUnderBear &&
+                            (
+                                //
+                                (mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish &&
+                                 mConditions.isXTSCurrentOverFarest)
+                                //
+                                ||
+                                //
+                                (mConditions.isXTSCurrentMin &&
+                                 mConditions.isXCHLHSCMCHHSame &&
+                                 mConditions.isXTSCurrentCrossedUnderNearest)
+                                //
+                                )
+                            //
+                            )
                            //
                            )
                        //
@@ -8019,7 +8036,30 @@ bool XUSCHF5XCHMACCHasShortSignal()
                        !mConditions.isXLHHHSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          ((mConditions.isXCHMAMCTrendsDown &&
+                            mConditions.isXCHMAMCFastUnderSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXLHHHDecreased &&
+                                     mConditions.isXTDBullOverBear &&
+                                     mConditions.isXTDSignalCrossedUnderBear &&
+                                     mConditions.isXLHPriceCrossedUnderSignal)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //
@@ -8079,13 +8119,37 @@ bool XUSCHF5XCHMACCHasShortSignal()
                             mConditions.isXCHMALCFastUnderSlow) &&
                            (
                                //
-                               (mConditions.isXTMBearish &&
-                                mConditions.isXAMABearish &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXLHLowAttachedLL &&
-                                mConditions.isXTDBullUnderBear &&
-                                mConditions.isXTDSignalUnderBear &&
-                                mConditions.isXTSCurrentUnderFarest)
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    ((mConditions.isXTDBullUnderBear &&
+                                      mConditions.isXTDSignalUnderBear) &&
+                                     (
+                                         //
+                                         (mConditions.isXLHLowAttachedLL &&
+                                          (
+                                              //
+                                              (mConditions.isXTSCurrentMin &&
+                                               mConditions.isXTSCurrentUnderFarest)
+                                              //
+                                              ||
+                                              //
+                                              (mConditions.isXTSAllSame &&
+                                               mConditions.isXCHLHSCMCLLSame &&
+                                               mConditions.isXCHMASCUnderMin)
+                                              //
+                                              )
+                                          //
+                                          )
+                                         //
+                                         )
+                                     //
+                                     )
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -8104,7 +8168,30 @@ bool XUSCHF5XCHMACCHasShortSignal()
                        !mConditions.isXLHLLSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          ((mConditions.isXTMBearish &&
+                            mConditions.isXAMABearish) &&
+                           (
+                               //
+                               ((mConditions.isXCHMASCTrendsUp &&
+                                 mConditions.isXCHMAMCTrendsUp &&
+                                 mConditions.isXCHMALCTrendsUp) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXCHLHSCMCLLSame &&
+                                     mConditions.isXCHMASCUnderMin &&
+                                     mConditions.isXTDBullCrossedUnderBear)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //