diff --git a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
index e2f98d04..a7836ae9 100644
--- a/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
@@ -9876,6 +9876,15 @@ bool XAU5XCHMACCHasShortSignal()
                                 mConditions.isXTSCurrentCrossedUnderNearest &&
                                 mConditions.isXTSCurrentCrossedUnderMediest)
                                //
+                               ||
+                               //
+                               (mConditions.isXTMBearish &&
+                                mConditions.isXAMABullish &&
+                                mConditions.isXTDBullOverBear &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentCrossedUnderNearest &&
+                                mConditions.isXTSCurrentCrossedUnderMediest)
+                               //
                                )
                            //
                            )
@@ -11387,10 +11396,20 @@ bool XAU5XCHMAMXHasShortSignal()
                             mConditions.isXTDSignalUnderBear) &&
                            (
                                //
-                               mConditions.isXTMStartBearish &&
-                               mConditions.isXAMAStartBearish &&
-                               mConditions.isXTSCurrentOverFarest &&
-                               mConditions.isXTSCurrentCrossedUnderNearest
+                               (mConditions.isXTMStartBearish &&
+                                mConditions.isXAMAStartBearish &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentCrossedUnderNearest)
+                               //
+                               ||
+                               //
+                               (mConditions.isXCHMAMCPeak &&
+                                mConditions.isXCHMALCPeak &&
+                                mConditions.isXTSCurrentMin &&
+                                mConditions.isXCHLHMCLCHHSame &&
+                                mConditions.isXTMStartBearish &&
+                                mConditions.isXAMAStartBearish &&
+                                mConditions.isXTSCurrentCrossedUnderNearest)
                                //
                                )
                            //
@@ -11529,10 +11548,21 @@ bool XAU5XCHMAMXHasShortSignal()
                             mConditions.isXCHMAMCFastOverSlow) &&
                            (
                                //
-                               (mConditions.isXTMNeutural &&
-                                mConditions.isXAMANeutural &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXTDBullOverBear)
+                               ((mConditions.isXTMNeutural &&
+                                 mConditions.isXAMANeutural) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXTDBullOverBear)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTDBullOverBear &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -11553,6 +11583,14 @@ bool XAU5XCHMAMXHasShortSignal()
                                 mConditions.isXTSCurrentCrossedUnderFarest &&
                                 mConditions.isXTSCurrentCrossedUnderMediest)
                                //
+                               ||
+                               //
+                               (mConditions.isXCHMALCPeak &&
+                                mConditions.isXAMABullish &&
+                                mConditions.isXCHLHMCLCLLSame &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentCrossedUnderMediest)
+                               //
                                )
                            //
                            )
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 3dea164c..504002f0 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -4,7 +4,7 @@ Resolve All XAU5 XCHMAMN Longs Old Guard Attacks on All Brokers ...
 
 Resolve All XAU5 XCHMAMN Longs Guard Attacks on All Brokers ...
 
-Resolve All XAU5 XCHMA Based Critical Guard Attacks on AMarkets-Real, GrowthNext ...
+Resolve All XAU5 XCHMA Based Critical Guard Attacks on MetaQuotes ...
 
 
 AMarkets-Real
diff --git a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
index e2f98d04..a7836ae9 100644
--- a/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
+++ b/Projects/XAU5/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
@@ -9876,6 +9876,15 @@ bool XAU5XCHMACCHasShortSignal()
                                 mConditions.isXTSCurrentCrossedUnderNearest &&
                                 mConditions.isXTSCurrentCrossedUnderMediest)
                                //
+                               ||
+                               //
+                               (mConditions.isXTMBearish &&
+                                mConditions.isXAMABullish &&
+                                mConditions.isXTDBullOverBear &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentCrossedUnderNearest &&
+                                mConditions.isXTSCurrentCrossedUnderMediest)
+                               //
                                )
                            //
                            )
@@ -11387,10 +11396,20 @@ bool XAU5XCHMAMXHasShortSignal()
                             mConditions.isXTDSignalUnderBear) &&
                            (
                                //
-                               mConditions.isXTMStartBearish &&
-                               mConditions.isXAMAStartBearish &&
-                               mConditions.isXTSCurrentOverFarest &&
-                               mConditions.isXTSCurrentCrossedUnderNearest
+                               (mConditions.isXTMStartBearish &&
+                                mConditions.isXAMAStartBearish &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentCrossedUnderNearest)
+                               //
+                               ||
+                               //
+                               (mConditions.isXCHMAMCPeak &&
+                                mConditions.isXCHMALCPeak &&
+                                mConditions.isXTSCurrentMin &&
+                                mConditions.isXCHLHMCLCHHSame &&
+                                mConditions.isXTMStartBearish &&
+                                mConditions.isXAMAStartBearish &&
+                                mConditions.isXTSCurrentCrossedUnderNearest)
                                //
                                )
                            //
@@ -11529,10 +11548,21 @@ bool XAU5XCHMAMXHasShortSignal()
                             mConditions.isXCHMAMCFastOverSlow) &&
                            (
                                //
-                               (mConditions.isXTMNeutural &&
-                                mConditions.isXAMANeutural &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXTDBullOverBear)
+                               ((mConditions.isXTMNeutural &&
+                                 mConditions.isXAMANeutural) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXTDBullOverBear)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTDBullOverBear &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -11553,6 +11583,14 @@ bool XAU5XCHMAMXHasShortSignal()
                                 mConditions.isXTSCurrentCrossedUnderFarest &&
                                 mConditions.isXTSCurrentCrossedUnderMediest)
                                //
+                               ||
+                               //
+                               (mConditions.isXCHMALCPeak &&
+                                mConditions.isXAMABullish &&
+                                mConditions.isXCHLHMCLCLLSame &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentCrossedUnderMediest)
+                               //
                                )
                            //
                            )
diff --git a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
index e2f98d04..a7836ae9 100644
--- a/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xau5.provider.indicators.lib.mq5
@@ -9876,6 +9876,15 @@ bool XAU5XCHMACCHasShortSignal()
                                 mConditions.isXTSCurrentCrossedUnderNearest &&
                                 mConditions.isXTSCurrentCrossedUnderMediest)
                                //
+                               ||
+                               //
+                               (mConditions.isXTMBearish &&
+                                mConditions.isXAMABullish &&
+                                mConditions.isXTDBullOverBear &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentCrossedUnderNearest &&
+                                mConditions.isXTSCurrentCrossedUnderMediest)
+                               //
                                )
                            //
                            )
@@ -11387,10 +11396,20 @@ bool XAU5XCHMAMXHasShortSignal()
                             mConditions.isXTDSignalUnderBear) &&
                            (
                                //
-                               mConditions.isXTMStartBearish &&
-                               mConditions.isXAMAStartBearish &&
-                               mConditions.isXTSCurrentOverFarest &&
-                               mConditions.isXTSCurrentCrossedUnderNearest
+                               (mConditions.isXTMStartBearish &&
+                                mConditions.isXAMAStartBearish &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentCrossedUnderNearest)
+                               //
+                               ||
+                               //
+                               (mConditions.isXCHMAMCPeak &&
+                                mConditions.isXCHMALCPeak &&
+                                mConditions.isXTSCurrentMin &&
+                                mConditions.isXCHLHMCLCHHSame &&
+                                mConditions.isXTMStartBearish &&
+                                mConditions.isXAMAStartBearish &&
+                                mConditions.isXTSCurrentCrossedUnderNearest)
                                //
                                )
                            //
@@ -11529,10 +11548,21 @@ bool XAU5XCHMAMXHasShortSignal()
                             mConditions.isXCHMAMCFastOverSlow) &&
                            (
                                //
-                               (mConditions.isXTMNeutural &&
-                                mConditions.isXAMANeutural &&
-                                mConditions.isXTSCurrentMin &&
-                                mConditions.isXTDBullOverBear)
+                               ((mConditions.isXTMNeutural &&
+                                 mConditions.isXAMANeutural) &&
+                                (
+                                    //
+                                    (mConditions.isXTSCurrentMin &&
+                                     mConditions.isXTDBullOverBear)
+                                    //
+                                    ||
+                                    //
+                                    (mConditions.isXTDBullOverBear &&
+                                     mConditions.isXTSCurrentOverFarest)
+                                    //
+                                    )
+                                //
+                                )
                                //
                                )
                            //
@@ -11553,6 +11583,14 @@ bool XAU5XCHMAMXHasShortSignal()
                                 mConditions.isXTSCurrentCrossedUnderFarest &&
                                 mConditions.isXTSCurrentCrossedUnderMediest)
                                //
+                               ||
+                               //
+                               (mConditions.isXCHMALCPeak &&
+                                mConditions.isXAMABullish &&
+                                mConditions.isXCHLHMCLCLLSame &&
+                                mConditions.isXTSCurrentOverFarest &&
+                                mConditions.isXTSCurrentCrossedUnderMediest)
+                               //
                                )
                            //
                            )