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 e74d5ad7..ce5fbcb4 100644
--- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -3499,6 +3499,21 @@ bool XUSCHF5XTDHasLongSignal()
                           ((mConditions.isXTMBullish &&
                             mConditions.isXAMABullish) &&
                            (
+                               //
+                               (mConditions.isXTSCurrentUnderMediest &&
+                                (
+                                    //
+                                    (mConditions.isXCHMASCOverMax &&
+                                     mConditions.isXTDBullOverBear &&
+                                     mConditions.isXCHLHSCMCHHSame &&
+                                     mConditions.isXTSCurrentOverFarest &&
+                                     mConditions.isXTDSignalCrossedOverBear)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               ||
                                //
                                (mConditions.isXTSCurrentMax &&
                                 mConditions.isXCHMASCOverMax &&
@@ -4231,11 +4246,22 @@ bool XUSCHF5XTDHasShortSignal()
                             mConditions.isXCHMAMCFastUnderSlow) &&
                            (
                                //
-                               (mConditions.isXLHHHIncreased &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXTSCurrentOverFarest &&
-                                mConditions.isXCHMALCFastUnderSlow &&
-                                mConditions.isXTDSignalCrossedUnderBear)
+                               ((mConditions.isXTDBullOverBear &&
+                                 mConditions.isXTSCurrentOverFarest) &&
+                                (
+                                    //
+                                    (mConditions.isXLHLLIncreased &&
+                                     mConditions.isXTSCurrentCrossedUnderNearest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXLHHHIncreased &&
+                                     mConditions.isXCHMALCFastUnderSlow &&
+                                     mConditions.isXTDSignalCrossedUnderBear)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index aa10493a..1539af81 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -15,7 +15,7 @@ XTD
 Resolve XUSCHF5 XTD Shorts All Stopouts in All Markets ...
 Resolve XUSCHF5 XTD Longs All Critical Guard Attacks in All Markets ...
 Resolve XUSCHF5 XTD Shorts All Critical Guard Attacks in All Markets ...
-Resolve XUSCHF5 XTD All Guard Attacks in AMarkets-Real ...
+Resolve XUSCHF5 XTD All Guard Attacks in OANDA ...
 
 
 XTAM
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 e74d5ad7..ce5fbcb4 100644
--- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -3499,6 +3499,21 @@ bool XUSCHF5XTDHasLongSignal()
                           ((mConditions.isXTMBullish &&
                             mConditions.isXAMABullish) &&
                            (
+                               //
+                               (mConditions.isXTSCurrentUnderMediest &&
+                                (
+                                    //
+                                    (mConditions.isXCHMASCOverMax &&
+                                     mConditions.isXTDBullOverBear &&
+                                     mConditions.isXCHLHSCMCHHSame &&
+                                     mConditions.isXTSCurrentOverFarest &&
+                                     mConditions.isXTDSignalCrossedOverBear)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               ||
                                //
                                (mConditions.isXTSCurrentMax &&
                                 mConditions.isXCHMASCOverMax &&
@@ -4231,11 +4246,22 @@ bool XUSCHF5XTDHasShortSignal()
                             mConditions.isXCHMAMCFastUnderSlow) &&
                            (
                                //
-                               (mConditions.isXLHHHIncreased &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXTSCurrentOverFarest &&
-                                mConditions.isXCHMALCFastUnderSlow &&
-                                mConditions.isXTDSignalCrossedUnderBear)
+                               ((mConditions.isXTDBullOverBear &&
+                                 mConditions.isXTSCurrentOverFarest) &&
+                                (
+                                    //
+                                    (mConditions.isXLHLLIncreased &&
+                                     mConditions.isXTSCurrentCrossedUnderNearest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXLHHHIncreased &&
+                                     mConditions.isXCHMALCFastUnderSlow &&
+                                     mConditions.isXTDSignalCrossedUnderBear)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index e74d5ad7..ce5fbcb4 100644
--- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -3499,6 +3499,21 @@ bool XUSCHF5XTDHasLongSignal()
                           ((mConditions.isXTMBullish &&
                             mConditions.isXAMABullish) &&
                            (
+                               //
+                               (mConditions.isXTSCurrentUnderMediest &&
+                                (
+                                    //
+                                    (mConditions.isXCHMASCOverMax &&
+                                     mConditions.isXTDBullOverBear &&
+                                     mConditions.isXCHLHSCMCHHSame &&
+                                     mConditions.isXTSCurrentOverFarest &&
+                                     mConditions.isXTDSignalCrossedOverBear)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               ||
                                //
                                (mConditions.isXTSCurrentMax &&
                                 mConditions.isXCHMASCOverMax &&
@@ -4231,11 +4246,22 @@ bool XUSCHF5XTDHasShortSignal()
                             mConditions.isXCHMAMCFastUnderSlow) &&
                            (
                                //
-                               (mConditions.isXLHHHIncreased &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXTSCurrentOverFarest &&
-                                mConditions.isXCHMALCFastUnderSlow &&
-                                mConditions.isXTDSignalCrossedUnderBear)
+                               ((mConditions.isXTDBullOverBear &&
+                                 mConditions.isXTSCurrentOverFarest) &&
+                                (
+                                    //
+                                    (mConditions.isXLHLLIncreased &&
+                                     mConditions.isXTSCurrentCrossedUnderNearest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXLHHHIncreased &&
+                                     mConditions.isXCHMALCFastUnderSlow &&
+                                     mConditions.isXTDSignalCrossedUnderBear)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //