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 93ef2cba..e1ded23d 100644
--- a/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -3798,7 +3798,55 @@ bool XUSCHF5XTAMHasShortSignal()
                        !mConditions.isXLHLLSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          // Check if MC Fast Over Slow ...
+                          ((mConditions.isXCHMAMCFastOverSlow ||
+                            mConditions.isXCHMAMCFastCrossedOverSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    (mConditions.isXCHLHSameLLs &&
+                                     mConditions.isXTSCurrentMin &&
+                                     mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXLHLowAttachedLL &&
+                                     mConditions.isXTDSignalUnderBear)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          ||
+                          //
+                          // Check LC Fast Over Slow ...
+                          ((mConditions.isXCHMALCFastOverSlow ||
+                            mConditions.isXCHMALCFastCrossedOverSlow) &&
+                           (
+                               //
+                               (mConditions.isXTMVale &&
+                                mConditions.isXAMAVale &&
+                                mConditions.isXTDSignalVale &&
+                                mConditions.isXTSCurrentMin &&
+                                mConditions.isXTDBullishVale &&
+                                mConditions.isXCHLHSCMCLLSame &&
+                                mConditions.isXLHLowAttachedLL &&
+                                mConditions.isXTDBullUnderBear &&
+                                mConditions.isXTDSignalUnderBear &&
+                                mConditions.isXTSCurrentUnderFarest &&
+                                mConditions.isXTSCurrentUnderNearest &&
+                                mConditions.isXTSCurrentUnderMediest)
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index b3d7ec62..b3a5c77d 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -9,7 +9,7 @@ ErranteSC
 Alpari
 
 Resolve XUSCHF5 XTD Shorts All Stopouts in All Markets ...
-Resolve XUSCHF5 XTAM Shorts All Stopouts in  ...
+Resolve XUSCHF5 XTAM Shorts All Stopouts in OANDA ...
 Resolve XUSCHF5 XSI Shorts All Stopouts in  ...
 Resolve XUSCHF5 XTSFI Shorts All Stopouts in  ...
 Resolve XUSCHF5 XOBDLH Shorts All Stopouts in  ...
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 93ef2cba..e1ded23d 100644
--- a/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Projects/XUSCHF5/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -3798,7 +3798,55 @@ bool XUSCHF5XTAMHasShortSignal()
                        !mConditions.isXLHLLSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          // Check if MC Fast Over Slow ...
+                          ((mConditions.isXCHMAMCFastOverSlow ||
+                            mConditions.isXCHMAMCFastCrossedOverSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    (mConditions.isXCHLHSameLLs &&
+                                     mConditions.isXTSCurrentMin &&
+                                     mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXLHLowAttachedLL &&
+                                     mConditions.isXTDSignalUnderBear)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          ||
+                          //
+                          // Check LC Fast Over Slow ...
+                          ((mConditions.isXCHMALCFastOverSlow ||
+                            mConditions.isXCHMALCFastCrossedOverSlow) &&
+                           (
+                               //
+                               (mConditions.isXTMVale &&
+                                mConditions.isXAMAVale &&
+                                mConditions.isXTDSignalVale &&
+                                mConditions.isXTSCurrentMin &&
+                                mConditions.isXTDBullishVale &&
+                                mConditions.isXCHLHSCMCLLSame &&
+                                mConditions.isXLHLowAttachedLL &&
+                                mConditions.isXTDBullUnderBear &&
+                                mConditions.isXTDSignalUnderBear &&
+                                mConditions.isXTSCurrentUnderFarest &&
+                                mConditions.isXTSCurrentUnderNearest &&
+                                mConditions.isXTSCurrentUnderMediest)
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //
diff --git a/Projects/XUSCHF5/Settings/XTAM.set b/Projects/XUSCHF5/Settings/XTAM.set
index 004e2b34..5a747db7 100644
Binary files a/Projects/XUSCHF5/Settings/XTAM.set and b/Projects/XUSCHF5/Settings/XTAM.set differ
diff --git a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
index 93ef2cba..e1ded23d 100644
--- a/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuschf5.provider.indicators.lib.mq5
@@ -3798,7 +3798,55 @@ bool XUSCHF5XTAMHasShortSignal()
                        !mConditions.isXLHLLSameInLength) &&
                       //
                       (
-                          false)
+                          //
+                          // Check if MC Fast Over Slow ...
+                          ((mConditions.isXCHMAMCFastOverSlow ||
+                            mConditions.isXCHMAMCFastCrossedOverSlow) &&
+                           (
+                               //
+                               ((mConditions.isXTMBearish &&
+                                 mConditions.isXAMABearish) &&
+                                (
+                                    //
+                                    (mConditions.isXCHLHSameLLs &&
+                                     mConditions.isXTSCurrentMin &&
+                                     mConditions.isXTDBullUnderBear &&
+                                     mConditions.isXLHLowAttachedLL &&
+                                     mConditions.isXTDSignalUnderBear)
+                                    //
+                                    )
+                                //
+                                )
+                               //
+                               )
+                           //
+                           )
+                          //
+                          ||
+                          //
+                          // Check LC Fast Over Slow ...
+                          ((mConditions.isXCHMALCFastOverSlow ||
+                            mConditions.isXCHMALCFastCrossedOverSlow) &&
+                           (
+                               //
+                               (mConditions.isXTMVale &&
+                                mConditions.isXAMAVale &&
+                                mConditions.isXTDSignalVale &&
+                                mConditions.isXTSCurrentMin &&
+                                mConditions.isXTDBullishVale &&
+                                mConditions.isXCHLHSCMCLLSame &&
+                                mConditions.isXLHLowAttachedLL &&
+                                mConditions.isXTDBullUnderBear &&
+                                mConditions.isXTDSignalUnderBear &&
+                                mConditions.isXTSCurrentUnderFarest &&
+                                mConditions.isXTSCurrentUnderNearest &&
+                                mConditions.isXTSCurrentUnderMediest)
+                               //
+                               )
+                           //
+                           )
+                          //
+                          )
                       //
                       )
                      //