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 d7b9b5e0..054e4aae 100644
--- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -4835,10 +4835,26 @@ bool XUSCHF5XTAMHasLongSignal()
                         mConditions.isXCHMASCFastCrossedUnderSlow) &&
                        (
                            //
-                           (mConditions.isXTMBearish &&
-                            mConditions.isXAMABearish &&
-                            mConditions.isXTDBullUnderBear &&
-                            mConditions.isXTDSignalUnderBear)
+                           ((mConditions.isXTMBearish &&
+                             mConditions.isXAMABearish) &&
+                            (
+                                //
+                                (mConditions.isXTDBullUnderBear &&
+                                 mConditions.isXTDSignalUnderBear)
+                                //
+                                ||
+                                //
+                                (mConditions.isXTSCurrentMax &&
+                                 mConditions.isXCHMASCOverMax &&
+                                 mConditions.isXCHLHSCMCHHSame &&
+                                 mConditions.isXCHLHSCMCLLSame &&
+                                 mConditions.isXCHMASCTrendsUp &&
+                                 mConditions.isXLHLowAttachedLL &&
+                                 mConditions.isXTDSignalUnderBear)
+                                //
+                                )
+                            //
+                            )
                            //
                            )
                        //
@@ -6594,11 +6610,23 @@ bool XUSCHF5XTAMHasShortSignal()
                                  mConditions.isXAMABullish) &&
                                 (
                                     //
-                                    (mConditions.isXTDBullOverBear &&
-                                     mConditions.isXCHMASCTrendsUp &&
-                                     mConditions.isXCHMAMCTrendsDown &&
-                                     mConditions.isXTSCurrentOverFarest &&
-                                     mConditions.isXCHMAMCFastUnderSlow)
+                                    ((mConditions.isXTDBullOverBear &&
+                                      mConditions.isXCHMASCTrendsUp &&
+                                      mConditions.isXCHMAMCTrendsDown &&
+                                      mConditions.isXCHMAMCFastUnderSlow) &&
+                                     (
+                                         //
+                                         mConditions.isXTSCurrentOverFarest
+                                         //
+                                         ||
+                                         //
+                                         (mConditions.isXTSCurrentMin &&
+                                          mConditions.isXTSCurrentCrossedUnderFarest &&
+                                          mConditions.isXTSCurrentCrossedUnderMediest)
+                                         //
+                                         )
+                                     //
+                                     )
                                     //
                                     )
                                 //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 06f1b384..5d3161cc 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -14,14 +14,14 @@ XTD
 ----
 Resolve XUSCHF5 XTD All Stopouts in All Markets ...
 Resolve XUSCHF5 XTD All Critical Guard Attacks in All Markets ...
-Resolve XUSCHF5 XTD All Guard Attacks in MetaQuotes ...
+Resolve XUSCHF5 XTD All Guard Attacks in All Markets ...
 
 
 XTAM
 -----
 Resolve XUSCHF5 XTAM All Stopouts in All Markets ...
 Resolve XUSCHF5 XTAM All Critical Guard Attacks in All Markets ...
-Resolve XUSCHF5 XTAM All Guard Attacks in All Markets ...
+Resolve XUSCHF5 XTAM All Guard Attacks in MetaQuotes ...
 
 
 XSI
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 d7b9b5e0..054e4aae 100644
--- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -4835,10 +4835,26 @@ bool XUSCHF5XTAMHasLongSignal()
                         mConditions.isXCHMASCFastCrossedUnderSlow) &&
                        (
                            //
-                           (mConditions.isXTMBearish &&
-                            mConditions.isXAMABearish &&
-                            mConditions.isXTDBullUnderBear &&
-                            mConditions.isXTDSignalUnderBear)
+                           ((mConditions.isXTMBearish &&
+                             mConditions.isXAMABearish) &&
+                            (
+                                //
+                                (mConditions.isXTDBullUnderBear &&
+                                 mConditions.isXTDSignalUnderBear)
+                                //
+                                ||
+                                //
+                                (mConditions.isXTSCurrentMax &&
+                                 mConditions.isXCHMASCOverMax &&
+                                 mConditions.isXCHLHSCMCHHSame &&
+                                 mConditions.isXCHLHSCMCLLSame &&
+                                 mConditions.isXCHMASCTrendsUp &&
+                                 mConditions.isXLHLowAttachedLL &&
+                                 mConditions.isXTDSignalUnderBear)
+                                //
+                                )
+                            //
+                            )
                            //
                            )
                        //
@@ -6594,11 +6610,23 @@ bool XUSCHF5XTAMHasShortSignal()
                                  mConditions.isXAMABullish) &&
                                 (
                                     //
-                                    (mConditions.isXTDBullOverBear &&
-                                     mConditions.isXCHMASCTrendsUp &&
-                                     mConditions.isXCHMAMCTrendsDown &&
-                                     mConditions.isXTSCurrentOverFarest &&
-                                     mConditions.isXCHMAMCFastUnderSlow)
+                                    ((mConditions.isXTDBullOverBear &&
+                                      mConditions.isXCHMASCTrendsUp &&
+                                      mConditions.isXCHMAMCTrendsDown &&
+                                      mConditions.isXCHMAMCFastUnderSlow) &&
+                                     (
+                                         //
+                                         mConditions.isXTSCurrentOverFarest
+                                         //
+                                         ||
+                                         //
+                                         (mConditions.isXTSCurrentMin &&
+                                          mConditions.isXTSCurrentCrossedUnderFarest &&
+                                          mConditions.isXTSCurrentCrossedUnderMediest)
+                                         //
+                                         )
+                                     //
+                                     )
                                     //
                                     )
                                 //
diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index d7b9b5e0..054e4aae 100644
--- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -4835,10 +4835,26 @@ bool XUSCHF5XTAMHasLongSignal()
                         mConditions.isXCHMASCFastCrossedUnderSlow) &&
                        (
                            //
-                           (mConditions.isXTMBearish &&
-                            mConditions.isXAMABearish &&
-                            mConditions.isXTDBullUnderBear &&
-                            mConditions.isXTDSignalUnderBear)
+                           ((mConditions.isXTMBearish &&
+                             mConditions.isXAMABearish) &&
+                            (
+                                //
+                                (mConditions.isXTDBullUnderBear &&
+                                 mConditions.isXTDSignalUnderBear)
+                                //
+                                ||
+                                //
+                                (mConditions.isXTSCurrentMax &&
+                                 mConditions.isXCHMASCOverMax &&
+                                 mConditions.isXCHLHSCMCHHSame &&
+                                 mConditions.isXCHLHSCMCLLSame &&
+                                 mConditions.isXCHMASCTrendsUp &&
+                                 mConditions.isXLHLowAttachedLL &&
+                                 mConditions.isXTDSignalUnderBear)
+                                //
+                                )
+                            //
+                            )
                            //
                            )
                        //
@@ -6594,11 +6610,23 @@ bool XUSCHF5XTAMHasShortSignal()
                                  mConditions.isXAMABullish) &&
                                 (
                                     //
-                                    (mConditions.isXTDBullOverBear &&
-                                     mConditions.isXCHMASCTrendsUp &&
-                                     mConditions.isXCHMAMCTrendsDown &&
-                                     mConditions.isXTSCurrentOverFarest &&
-                                     mConditions.isXCHMAMCFastUnderSlow)
+                                    ((mConditions.isXTDBullOverBear &&
+                                      mConditions.isXCHMASCTrendsUp &&
+                                      mConditions.isXCHMAMCTrendsDown &&
+                                      mConditions.isXCHMAMCFastUnderSlow) &&
+                                     (
+                                         //
+                                         mConditions.isXTSCurrentOverFarest
+                                         //
+                                         ||
+                                         //
+                                         (mConditions.isXTSCurrentMin &&
+                                          mConditions.isXTSCurrentCrossedUnderFarest &&
+                                          mConditions.isXTSCurrentCrossedUnderMediest)
+                                         //
+                                         )
+                                     //
+                                     )
                                     //
                                     )
                                 //