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 0215a6d1..a8ea52ac 100644
--- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -9184,12 +9184,23 @@ bool XUSCHF5XCHMAMNHasShortSignal()
                             mConditions.isXCHMAMCFastUnderSlow) &&
                            (
                                //
-                               (mConditions.isXTSAllSame &&
-                                mConditions.isXFIOverZero &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXFICrossedOverZero &&
-                                mConditions.isXCHMASCCrossedUnderMin &&
-                                mConditions.isXCHMASCFastCrossedUnderSlow)
+                               ((mConditions.isXFIOverZero &&
+                                 mConditions.isXTDBullOverBear &&
+                                 mConditions.isXFICrossedOverZero) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMax &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTSAllSame &&
+                                     mConditions.isXCHMASCCrossedUnderMin &&
+                                     mConditions.isXCHMASCFastCrossedUnderSlow)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index bab5b6f9..463c7bc9 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -17,4 +17,4 @@ 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 All Markets ...
 Resolve XUSCHF5 XCHMAMX Shorts All Stopouts in All Markets ...
-Resolve XUSCHF5 XCHMAMN Shorts All Stopouts in MetaQuotes ...
+Resolve XUSCHF5 XCHMAMN Shorts All Stopouts in HFMarkets ...
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 0215a6d1..a8ea52ac 100644
--- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -9184,12 +9184,23 @@ bool XUSCHF5XCHMAMNHasShortSignal()
                             mConditions.isXCHMAMCFastUnderSlow) &&
                            (
                                //
-                               (mConditions.isXTSAllSame &&
-                                mConditions.isXFIOverZero &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXFICrossedOverZero &&
-                                mConditions.isXCHMASCCrossedUnderMin &&
-                                mConditions.isXCHMASCFastCrossedUnderSlow)
+                               ((mConditions.isXFIOverZero &&
+                                 mConditions.isXTDBullOverBear &&
+                                 mConditions.isXFICrossedOverZero) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMax &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTSAllSame &&
+                                     mConditions.isXCHMASCCrossedUnderMin &&
+                                     mConditions.isXCHMASCFastCrossedUnderSlow)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index 0215a6d1..a8ea52ac 100644
--- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -9184,12 +9184,23 @@ bool XUSCHF5XCHMAMNHasShortSignal()
                             mConditions.isXCHMAMCFastUnderSlow) &&
                            (
                                //
-                               (mConditions.isXTSAllSame &&
-                                mConditions.isXFIOverZero &&
-                                mConditions.isXTDBullOverBear &&
-                                mConditions.isXFICrossedOverZero &&
-                                mConditions.isXCHMASCCrossedUnderMin &&
-                                mConditions.isXCHMASCFastCrossedUnderSlow)
+                               ((mConditions.isXFIOverZero &&
+                                 mConditions.isXTDBullOverBear &&
+                                 mConditions.isXFICrossedOverZero) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMax &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTSAllSame &&
+                                     mConditions.isXCHMASCCrossedUnderMin &&
+                                     mConditions.isXCHMASCFastCrossedUnderSlow)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //