diff --git a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 3b3698e5..78778559 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -38127,7 +38127,27 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMAMCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        ((!mConditions.isXCHMASCTrendsUp &&
+                                          !mConditions.isXCHMASCTrendsDown &&
+                                          mConditions.isXCHMASCFastUnderSlow) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXAMANeutural &&
+                                              mConditions.isXTSCurrentMin &&
+                                              mConditions.isXLHHHIncreased &&
+                                              mConditions.isXCHLHMCLCLLSame)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -38242,7 +38262,17 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMAMCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXLHHHIncreased &&
+                                         mConditions.isXLHPriceCrossedUnderSignal)
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -38701,7 +38731,32 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMASCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        (mConditions.isXTSCurrentOverNearest &&
+                                         (
+                                             //
+                                             ((!mConditions.isXCHMAMCTrendsUp &&
+                                               !mConditions.isXCHMAMCTrendsDown &&
+                                               mConditions.isXCHMAMCFastUnderSlow) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXCHMASCPeak &&
+                                                   mConditions.isXCHMASCUnderMin &&
+                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -39177,7 +39232,29 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMASCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        ((!mConditions.isXCHMAMCTrendsUp &&
+                                          !mConditions.isXCHMAMCTrendsDown &&
+                                          mConditions.isXCHMAMCFastUnderSlow) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXTMNeutural &&
+                                              mConditions.isXAMANeutural &&
+                                              mConditions.isXCHLHSCMCLLSame &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXLHLowAttachedLL &&
+                                              mConditions.isXLHPriceCrossedUnderSignal)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -39217,6 +39294,33 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Stop Outs ...
+                              // HH Same In Length ...
+                              // Price Under Signal ...
+                              // All Bearish ...
+                              ((mConditions.isXTMBearish &&
+                                mConditions.isXAMABearish) &&
+                               (
+                                   //
+                                   (mConditions.isXRSICrossedUnderShortExit &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXCHLHSCMCHHSame &&
+                                         mConditions.isXCHMASCUnderMin)
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
@@ -39670,7 +39774,23 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMAMCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   ((mConditions.isXTDBullOverBear &&
+                                     mConditions.isXTDSignalOverBear) &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXCHLHSameLLs &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXLHHHIncreased &&
+                                         mConditions.isXCHLHSCMCHHSame &&
+                                         mConditions.isXTMStartBearish &&
+                                         mConditions.isXAMAStartBearish &&
+                                         mConditions.isXLHLowAttachedLL &&
+                                         mConditions.isXLHPriceCrossedUnderSignal)
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index dbf32da1..ff72b019 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -42,7 +42,7 @@ Resolve XUSPY5 XTSFI All Guard Attacks in All Markets ...
 
 XCHMACC
 --------
-Resolve XUSPY5 XCHMACC All Shorts Stopouts in AMarkets-Real ...
+Resolve XUSPY5 XCHMACC All Shorts Stopouts in OANDA ...
 Resolve XUSPY5 XCHMACC All Critical Guard Attacks in All Markets ...
 Resolve XUSPY5 XCHMACC All Guard Attacks in All Markets ...
 
diff --git a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 3b3698e5..78778559 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -38127,7 +38127,27 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMAMCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        ((!mConditions.isXCHMASCTrendsUp &&
+                                          !mConditions.isXCHMASCTrendsDown &&
+                                          mConditions.isXCHMASCFastUnderSlow) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXAMANeutural &&
+                                              mConditions.isXTSCurrentMin &&
+                                              mConditions.isXLHHHIncreased &&
+                                              mConditions.isXCHLHMCLCLLSame)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -38242,7 +38262,17 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMAMCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXLHHHIncreased &&
+                                         mConditions.isXLHPriceCrossedUnderSignal)
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -38701,7 +38731,32 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMASCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        (mConditions.isXTSCurrentOverNearest &&
+                                         (
+                                             //
+                                             ((!mConditions.isXCHMAMCTrendsUp &&
+                                               !mConditions.isXCHMAMCTrendsDown &&
+                                               mConditions.isXCHMAMCFastUnderSlow) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXCHMASCPeak &&
+                                                   mConditions.isXCHMASCUnderMin &&
+                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -39177,7 +39232,29 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMASCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        ((!mConditions.isXCHMAMCTrendsUp &&
+                                          !mConditions.isXCHMAMCTrendsDown &&
+                                          mConditions.isXCHMAMCFastUnderSlow) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXTMNeutural &&
+                                              mConditions.isXAMANeutural &&
+                                              mConditions.isXCHLHSCMCLLSame &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXLHLowAttachedLL &&
+                                              mConditions.isXLHPriceCrossedUnderSignal)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -39217,6 +39294,33 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Stop Outs ...
+                              // HH Same In Length ...
+                              // Price Under Signal ...
+                              // All Bearish ...
+                              ((mConditions.isXTMBearish &&
+                                mConditions.isXAMABearish) &&
+                               (
+                                   //
+                                   (mConditions.isXRSICrossedUnderShortExit &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXCHLHSCMCHHSame &&
+                                         mConditions.isXCHMASCUnderMin)
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
@@ -39670,7 +39774,23 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMAMCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   ((mConditions.isXTDBullOverBear &&
+                                     mConditions.isXTDSignalOverBear) &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXCHLHSameLLs &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXLHHHIncreased &&
+                                         mConditions.isXCHLHSCMCHHSame &&
+                                         mConditions.isXTMStartBearish &&
+                                         mConditions.isXAMAStartBearish &&
+                                         mConditions.isXLHLowAttachedLL &&
+                                         mConditions.isXLHPriceCrossedUnderSignal)
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
diff --git a/Projects/XUSPY5/Settings/XCHMACC.set b/Projects/XUSPY5/Settings/XCHMACC.set
index caa635e0..abdb03d7 100644
Binary files a/Projects/XUSPY5/Settings/XCHMACC.set and b/Projects/XUSPY5/Settings/XCHMACC.set differ
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 3b3698e5..78778559 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -38127,7 +38127,27 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMAMCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        ((!mConditions.isXCHMASCTrendsUp &&
+                                          !mConditions.isXCHMASCTrendsDown &&
+                                          mConditions.isXCHMASCFastUnderSlow) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXAMANeutural &&
+                                              mConditions.isXTSCurrentMin &&
+                                              mConditions.isXLHHHIncreased &&
+                                              mConditions.isXCHLHMCLCLLSame)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -38242,7 +38262,17 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMAMCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXLHHHIncreased &&
+                                         mConditions.isXLHPriceCrossedUnderSignal)
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -38701,7 +38731,32 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMASCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        (mConditions.isXTSCurrentOverNearest &&
+                                         (
+                                             //
+                                             ((!mConditions.isXCHMAMCTrendsUp &&
+                                               !mConditions.isXCHMAMCTrendsDown &&
+                                               mConditions.isXCHMAMCFastUnderSlow) &&
+                                              (
+                                                  //
+                                                  (mConditions.isXCHMASCPeak &&
+                                                   mConditions.isXCHMASCUnderMin &&
+                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -39177,7 +39232,29 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMASCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTDBullOverBear &&
+                                    (
+                                        //
+                                        ((!mConditions.isXCHMAMCTrendsUp &&
+                                          !mConditions.isXCHMAMCTrendsDown &&
+                                          mConditions.isXCHMAMCFastUnderSlow) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMALCVale &&
+                                              mConditions.isXTMNeutural &&
+                                              mConditions.isXAMANeutural &&
+                                              mConditions.isXCHLHSCMCLLSame &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXLHLowAttachedLL &&
+                                              mConditions.isXLHPriceCrossedUnderSignal)
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -39217,6 +39294,33 @@ bool XUSPY5XCHMACCHasShortSignal()
                                //
                                )
                               //
+                              ||
+                              //
+                              // XCHMACC Short ...
+                              // Resolve Stop Outs ...
+                              // HH Same In Length ...
+                              // Price Under Signal ...
+                              // All Bearish ...
+                              ((mConditions.isXTMBearish &&
+                                mConditions.isXAMABearish) &&
+                               (
+                                   //
+                                   (mConditions.isXRSICrossedUnderShortExit &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXCHLHSCMCHHSame &&
+                                         mConditions.isXCHMASCUnderMin)
+                                        //
+                                        )
+                                    //
+                                    )
+                                   //
+                                   )
+                               //
+                               )
+                              //
                               )
                           //
                           )
@@ -39670,7 +39774,23 @@ bool XUSPY5XCHMACCHasShortSignal()
                                 mConditions.isXCHMAMCFastUnderSlow) &&
                                (
                                    //
-                                   false
+                                   ((mConditions.isXTDBullOverBear &&
+                                     mConditions.isXTDSignalOverBear) &&
+                                    (
+                                        //
+                                        (mConditions.isXCHMALCVale &&
+                                         mConditions.isXCHLHSameLLs &&
+                                         mConditions.isXTSCurrentMin &&
+                                         mConditions.isXLHHHIncreased &&
+                                         mConditions.isXCHLHSCMCHHSame &&
+                                         mConditions.isXTMStartBearish &&
+                                         mConditions.isXAMAStartBearish &&
+                                         mConditions.isXLHLowAttachedLL &&
+                                         mConditions.isXLHPriceCrossedUnderSignal)
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //