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 ccb25ee6..07ba2ad4 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -2726,6 +2726,42 @@ bool XUSPY5XTDHasShortSignal()
                                 mConditions.isXCHMASCTrendsUp &&
                                 mConditions.isXTSCurrentOverFarest)
                                //
+                               ||
+                               //
+                               (mConditions.isXTDBullOverBear &&
+                                (
+                                    //
+                                    ((mConditions.isXAMANeutural ||
+                                      mConditions.isXAMAEndBullish) &&
+                                     //
+                                     (mConditions.isXCHMASCPeak &&
+                                      mConditions.isXCHMALCVale &&
+                                      mConditions.isXCHLHSCMCHHSame &&
+                                      mConditions.isXCHLHMCLCLLSame)
+                                     //
+                                     )
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          ||
+                          //
+                          (mConditions.isXTSCurrentOverFarest &&
+                           (
+                               //
+                               (mConditions.isXTDBullOverBear &&
+                                mConditions.isXTMStartBearish &&
+                                mConditions.isXAMAEndBullish &&
+                                mConditions.isXAMANeutural &&
+                                mConditions.isXCHMASCPeak &&
+                                mConditions.isXCHMALCVale &&
+                                mConditions.isXCHLHMCLCLLSame)
+                               //
                                )
                            //
                            )
@@ -2790,11 +2826,21 @@ bool XUSPY5XTDHasShortSignal()
                             mConditions.isXCHMASCFastCrossedOverSlow) &&
                            (
                                //
-                               (mConditions.isXCHMALCVale &&
-                                mConditions.isXCHMASCTrendsUp &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXCHLHSCMCHHSame &&
-                                mConditions.isXTSCurrentOverFarest)
+                               ((mConditions.isXCHMALCVale &&
+                                 mConditions.isXTDBullOverBear &&
+                                 mConditions.isXCHMASCTrendsUp &&
+                                 mConditions.isXCHLHSCMCHHSame) &&
+                                (
+                                    //
+                                    mConditions.isXTSAllSame
+                                    //
+                                    ||
+                                    //
+                                    mConditions.isXTSCurrentOverFarest
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 35ff62b2..914c57da 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -12,7 +12,7 @@ All Markets
 
 XTD
 ----
-Resolve XUSPY5 XTD All Shorts Stopouts in GrowthNext ...
+Resolve XUSPY5 XTD All Shorts Stopouts in OANDA ...
 Resolve XUSPY5 XTD All Critical Guard Attacks in All Markets ...
 Resolve XUSPY5 XTD 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 ccb25ee6..07ba2ad4 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -2726,6 +2726,42 @@ bool XUSPY5XTDHasShortSignal()
                                 mConditions.isXCHMASCTrendsUp &&
                                 mConditions.isXTSCurrentOverFarest)
                                //
+                               ||
+                               //
+                               (mConditions.isXTDBullOverBear &&
+                                (
+                                    //
+                                    ((mConditions.isXAMANeutural ||
+                                      mConditions.isXAMAEndBullish) &&
+                                     //
+                                     (mConditions.isXCHMASCPeak &&
+                                      mConditions.isXCHMALCVale &&
+                                      mConditions.isXCHLHSCMCHHSame &&
+                                      mConditions.isXCHLHMCLCLLSame)
+                                     //
+                                     )
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          ||
+                          //
+                          (mConditions.isXTSCurrentOverFarest &&
+                           (
+                               //
+                               (mConditions.isXTDBullOverBear &&
+                                mConditions.isXTMStartBearish &&
+                                mConditions.isXAMAEndBullish &&
+                                mConditions.isXAMANeutural &&
+                                mConditions.isXCHMASCPeak &&
+                                mConditions.isXCHMALCVale &&
+                                mConditions.isXCHLHMCLCLLSame)
+                               //
                                )
                            //
                            )
@@ -2790,11 +2826,21 @@ bool XUSPY5XTDHasShortSignal()
                             mConditions.isXCHMASCFastCrossedOverSlow) &&
                            (
                                //
-                               (mConditions.isXCHMALCVale &&
-                                mConditions.isXCHMASCTrendsUp &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXCHLHSCMCHHSame &&
-                                mConditions.isXTSCurrentOverFarest)
+                               ((mConditions.isXCHMALCVale &&
+                                 mConditions.isXTDBullOverBear &&
+                                 mConditions.isXCHMASCTrendsUp &&
+                                 mConditions.isXCHLHSCMCHHSame) &&
+                                (
+                                    //
+                                    mConditions.isXTSAllSame
+                                    //
+                                    ||
+                                    //
+                                    mConditions.isXTSCurrentOverFarest
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index ccb25ee6..07ba2ad4 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -2726,6 +2726,42 @@ bool XUSPY5XTDHasShortSignal()
                                 mConditions.isXCHMASCTrendsUp &&
                                 mConditions.isXTSCurrentOverFarest)
                                //
+                               ||
+                               //
+                               (mConditions.isXTDBullOverBear &&
+                                (
+                                    //
+                                    ((mConditions.isXAMANeutural ||
+                                      mConditions.isXAMAEndBullish) &&
+                                     //
+                                     (mConditions.isXCHMASCPeak &&
+                                      mConditions.isXCHMALCVale &&
+                                      mConditions.isXCHLHSCMCHHSame &&
+                                      mConditions.isXCHLHMCLCLLSame)
+                                     //
+                                     )
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          ||
+                          //
+                          (mConditions.isXTSCurrentOverFarest &&
+                           (
+                               //
+                               (mConditions.isXTDBullOverBear &&
+                                mConditions.isXTMStartBearish &&
+                                mConditions.isXAMAEndBullish &&
+                                mConditions.isXAMANeutural &&
+                                mConditions.isXCHMASCPeak &&
+                                mConditions.isXCHMALCVale &&
+                                mConditions.isXCHLHMCLCLLSame)
+                               //
                                )
                            //
                            )
@@ -2790,11 +2826,21 @@ bool XUSPY5XTDHasShortSignal()
                             mConditions.isXCHMASCFastCrossedOverSlow) &&
                            (
                                //
-                               (mConditions.isXCHMALCVale &&
-                                mConditions.isXCHMASCTrendsUp &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXCHLHSCMCHHSame &&
-                                mConditions.isXTSCurrentOverFarest)
+                               ((mConditions.isXCHMALCVale &&
+                                 mConditions.isXTDBullOverBear &&
+                                 mConditions.isXCHMASCTrendsUp &&
+                                 mConditions.isXCHLHSCMCHHSame) &&
+                                (
+                                    //
+                                    mConditions.isXTSAllSame
+                                    //
+                                    ||
+                                    //
+                                    mConditions.isXTSCurrentOverFarest
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //