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 ff043828..a7179cdd 100644
--- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -8011,10 +8011,26 @@ bool XUSCHF5XSIHasShortSignal()
                             mConditions.isXCHMAMCFastCrossedOverSlow) &&
                            (
                                //
-                               (mConditions.isXTDBullOverBear &&
-                                mConditions.isXCHMAMCTrendsUp &&
-                                mConditions.isXTDSignalOverBear &&
-                                mConditions.isXTSCurrentOverFarest)
+                               ((mConditions.isXTDBullOverBear &&
+                                 mConditions.isXTDSignalOverBear) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXCHMAMCPeak &&
+                                     mConditions.isXTSCurrentMin &&
+                                     mConditions.isXCHMASCOverMax &&
+                                     mConditions.isXCHLHSCMCHHSame &&
+                                     mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXCHMALCTrendsDown &&
+                                     mConditions.isXCHMALCFastUnderSlow)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index aea491c3..45e14491 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -28,7 +28,7 @@ XSI
 ----
 Resolve XUSCHF5 XSI All Stopouts in All Markets ...
 Resolve XUSCHF5 XSI Shorts All Critical Guard Attacks in All Markets ...
-Resolve XUSCHF5 XSI All Guard Attacks in OANDA ...
+Resolve XUSCHF5 XSI All Guard Attacks in HFMarkets ...
 
 
 XTSFI
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 ff043828..a7179cdd 100644
--- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -8011,10 +8011,26 @@ bool XUSCHF5XSIHasShortSignal()
                             mConditions.isXCHMAMCFastCrossedOverSlow) &&
                            (
                                //
-                               (mConditions.isXTDBullOverBear &&
-                                mConditions.isXCHMAMCTrendsUp &&
-                                mConditions.isXTDSignalOverBear &&
-                                mConditions.isXTSCurrentOverFarest)
+                               ((mConditions.isXTDBullOverBear &&
+                                 mConditions.isXTDSignalOverBear) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXCHMAMCPeak &&
+                                     mConditions.isXTSCurrentMin &&
+                                     mConditions.isXCHMASCOverMax &&
+                                     mConditions.isXCHLHSCMCHHSame &&
+                                     mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXCHMALCTrendsDown &&
+                                     mConditions.isXCHMALCFastUnderSlow)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index ff043828..a7179cdd 100644
--- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -8011,10 +8011,26 @@ bool XUSCHF5XSIHasShortSignal()
                             mConditions.isXCHMAMCFastCrossedOverSlow) &&
                            (
                                //
-                               (mConditions.isXTDBullOverBear &&
-                                mConditions.isXCHMAMCTrendsUp &&
-                                mConditions.isXTDSignalOverBear &&
-                                mConditions.isXTSCurrentOverFarest)
+                               ((mConditions.isXTDBullOverBear &&
+                                 mConditions.isXTDSignalOverBear) &&
+                                (
+                                    //
+                                    (mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXCHMAMCPeak &&
+                                     mConditions.isXTSCurrentMin &&
+                                     mConditions.isXCHMASCOverMax &&
+                                     mConditions.isXCHLHSCMCHHSame &&
+                                     mConditions.isXCHMAMCTrendsUp &&
+                                     mConditions.isXCHMALCTrendsDown &&
+                                     mConditions.isXCHMALCFastUnderSlow)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //