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 3475b9be..0bb04dd9 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -7774,7 +7774,22 @@ bool XUSPY5XTAMHasLongSignal()
                                 mConditions.isXCHMASCFastCrossedUnderSlow) &&
                                (
                                    //
-                                   false
+                                   ((mConditions.isXCHMAMCTrendsDown &&
+                                     mConditions.isXCHMAMCFastOverSlow) &&
+                                    (
+                                        //
+                                        (mConditions.isXTMBearish &&
+                                         mConditions.isXAMABearish &&
+                                         mConditions.isXCHMALCPeak &&
+                                         mConditions.isXCHMASCOverMax &&
+                                         mConditions.isXCHLHMCLCHHSame &&
+                                         mConditions.isXTDBullUnderBear &&
+                                         mConditions.isXTDSignalUnderBear &&
+                                         mConditions.isXTSCurrentUnderFarest)
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -8598,10 +8613,20 @@ bool XUSPY5XTAMHasLongSignal()
                                    (mConditions.isXTDSignalUnderBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMASCOverMax &&
-                                         mConditions.isXCHLHSCMCHHSame &&
-                                         mConditions.isXLHHighAttachedHH &&
-                                         mConditions.isXCHMASCCrossedOverMax)
+                                        ((mConditions.isXCHMASCOverMax &&
+                                          mConditions.isXCHLHSCMCHHSame &&
+                                          mConditions.isXLHHighAttachedHH) &&
+                                         (
+                                             //
+                                             mConditions.isXTSCurrentMax
+                                             //
+                                             ||
+                                             //
+                                             mConditions.isXCHMASCCrossedOverMax
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -8635,7 +8660,18 @@ bool XUSPY5XTAMHasLongSignal()
                                          (
                                              //
                                              (mConditions.isXCHMASCOverMax &&
-                                              mConditions.isXRSICrossedOverLongExit)
+                                              (
+                                                  //
+                                                  mConditions.isXRSICrossedOverLongExit
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXTSCurrentOverFarest &&
+                                                   mConditions.isXTSCurrentOverMediest)
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              ||
                                              //
@@ -8742,23 +8778,37 @@ bool XUSPY5XTAMHasLongSignal()
                                         //
                                         ||
                                         //
-                                        ((mConditions.isXLHHighAttachedHH &&
-                                          mConditions.isXCHMAMCFastCrossedOverSlow) &&
+                                        (mConditions.isXLHHighAttachedHH &&
                                          (
                                              //
-                                             (mConditions.isXCHMASCPeak &&
-                                              mConditions.isXCHLHSCMCHHSame)
+                                             (mConditions.isXCHLHSameHHs &&
+                                              mConditions.isXTSCurrentMax &&
+                                              mConditions.isXCHMASCOverMax &&
+                                              mConditions.isXCHLHMCLCLLSame &&
+                                              mConditions.isXLHPriceCrossedOverSignal)
                                              //
                                              ||
                                              //
-                                             ((mConditions.isXTMStartBullish &&
-                                               mConditions.isXAMAStartBullish) &&
+                                             (mConditions.isXCHMAMCFastCrossedOverSlow &&
                                               (
                                                   //
-                                                  (mConditions.isXCHLHSameHHs &&
-                                                   mConditions.isXCHMASCCrossedOverMax &&
-                                                   mConditions.isXLHPriceCrossedOverSignal &&
-                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  (mConditions.isXCHMASCPeak &&
+                                                   mConditions.isXCHLHSCMCHHSame)
+                                                  //
+                                                  ||
+                                                  //
+                                                  ((mConditions.isXTMStartBullish &&
+                                                    mConditions.isXAMAStartBullish) &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXCHLHSameHHs &&
+                                                        mConditions.isXCHMASCCrossedOverMax &&
+                                                        mConditions.isXLHPriceCrossedOverSignal &&
+                                                        mConditions.isXTSCurrentCrossedOverNearest)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
                                                   //
                                                   )
                                               //
@@ -9704,6 +9754,14 @@ bool XUSPY5XTAMHasLongSignal()
                               ((mConditions.isXCHMALCFastUnderSlow ||
                                 mConditions.isXCHMALCFastCrossedUnderSlow) &&
                                (
+                                   //
+                                   (mConditions.isXCHMAMCPeak &&
+                                    mConditions.isXTSCurrentMax &&
+                                    mConditions.isXTDBearishVale &&
+                                    mConditions.isXCHLHSCMCHHSame &&
+                                    mConditions.isXLHHighAttachedHH)
+                                   //
+                                   ||
                                    //
                                    (mConditions.isXTSCurrentUnderNearest &&
                                     (
@@ -10571,7 +10629,13 @@ bool XUSPY5XTAMHasShortSignal()
                                 mConditions.isXCHMALCFastCrossedOverSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTMBullish &&
+                                    mConditions.isXAMABullish &&
+                                    mConditions.isXCHMALCPeak &&
+                                    mConditions.isXTSCurrentOverNearest &&
+                                    mConditions.isXTSCurrentOverMediest &&
+                                    mConditions.isXTSCurrentCrossedOverNearest &&
+                                    mConditions.isXTSCurrentCrossedOverMediest)
                                    //
                                    )
                                //
@@ -10959,6 +11023,28 @@ bool XUSPY5XTAMHasShortSignal()
                                               mConditions.isXTSCurrentOverMediest &&
                                               mConditions.isXTDBullCrossedOverBear)
                                              //
+                                             ||
+                                             //
+                                             (mConditions.isXCHMAMCTrendsUp &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTSCurrentOverMediest &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXCHMAMCPeak &&
+                                                        mConditions.isXCHMALCPeak &&
+                                                        mConditions.isXCHMASCOverMax &&
+                                                        mConditions.isXCHLHMCLCHHSame &&
+                                                        mConditions.isXCHLHMCLCLLSame)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
                                              )
                                          //
                                          )
@@ -10999,7 +11085,10 @@ bool XUSPY5XTAMHasShortSignal()
                                 mConditions.isXCHMALCFastCrossedOverSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTSCurrentOverNearest &&
+                                    mConditions.isXTSCurrentOverMediest &&
+                                    mConditions.isXTMNeutural &&
+                                    mConditions.isXAMANeutural)
                                    //
                                    )
                                //
@@ -11214,6 +11303,34 @@ bool XUSPY5XTAMHasShortSignal()
                                    ((mConditions.isXCHMAMCTrendsDown &&
                                      mConditions.isXCHMAMCFastUnderSlow) &&
                                     (
+                                        //
+                                        (mConditions.isXCHMASCTrendsUp &&
+                                         (
+                                             //
+                                             (mConditions.isXTDBullOverBear &&
+                                              (
+                                                  //
+                                                  ((mConditions.isXCHMALCVale &&
+                                                    mConditions.isXTSCurrentMin &&
+                                                    mConditions.isXCHLHSCMCHHSame) &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXTMNeutural &&
+                                                        mConditions.isXAMANeutural)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
                                         //
                                         (mConditions.isXTSCurrentOverFarest &&
                                          (
@@ -12001,11 +12118,30 @@ bool XUSPY5XTAMHasShortSignal()
                                      mConditions.isXTDSignalUnderBear) &&
                                     (
                                         //
-                                        (mConditions.isXCHMAMCVale &&
-                                         mConditions.isXCHLHSameLLs &&
-                                         mConditions.isXTSCurrentMin &&
-                                         mConditions.isXCHMASCUnderMin &&
-                                         mConditions.isXCHMASCCrossedUnderMin)
+                                        (mConditions.isXTSCurrentMin &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMAMCVale &&
+                                              mConditions.isXCHLHSameLLs &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXCHMASCCrossedUnderMin)
+                                             //
+                                             ||
+                                             //
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXCHMASCCrossedUnderMax) &&
+                                              (
+                                                  //
+                                                  (!mConditions.isXCHMAMCTrendsUp &&
+                                                   !mConditions.isXCHMAMCTrendsDown)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 65d7f674..8656f06a 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -23,7 +23,7 @@ XTAM
 -----
 Resolve XUSPY5 XTAM All Stopouts in All Markets ...
 Resolve XUSPY5 XTAM All Critical Guard Attacks in All Markets ...
-Resolve XUSPY5 XTAM All Guard Attacks in OANDA ...
+Resolve XUSPY5 XTAM All Guard Attacks in MetaQuotes ...
 
 
 XSI
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 3475b9be..0bb04dd9 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -7774,7 +7774,22 @@ bool XUSPY5XTAMHasLongSignal()
                                 mConditions.isXCHMASCFastCrossedUnderSlow) &&
                                (
                                    //
-                                   false
+                                   ((mConditions.isXCHMAMCTrendsDown &&
+                                     mConditions.isXCHMAMCFastOverSlow) &&
+                                    (
+                                        //
+                                        (mConditions.isXTMBearish &&
+                                         mConditions.isXAMABearish &&
+                                         mConditions.isXCHMALCPeak &&
+                                         mConditions.isXCHMASCOverMax &&
+                                         mConditions.isXCHLHMCLCHHSame &&
+                                         mConditions.isXTDBullUnderBear &&
+                                         mConditions.isXTDSignalUnderBear &&
+                                         mConditions.isXTSCurrentUnderFarest)
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -8598,10 +8613,20 @@ bool XUSPY5XTAMHasLongSignal()
                                    (mConditions.isXTDSignalUnderBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMASCOverMax &&
-                                         mConditions.isXCHLHSCMCHHSame &&
-                                         mConditions.isXLHHighAttachedHH &&
-                                         mConditions.isXCHMASCCrossedOverMax)
+                                        ((mConditions.isXCHMASCOverMax &&
+                                          mConditions.isXCHLHSCMCHHSame &&
+                                          mConditions.isXLHHighAttachedHH) &&
+                                         (
+                                             //
+                                             mConditions.isXTSCurrentMax
+                                             //
+                                             ||
+                                             //
+                                             mConditions.isXCHMASCCrossedOverMax
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -8635,7 +8660,18 @@ bool XUSPY5XTAMHasLongSignal()
                                          (
                                              //
                                              (mConditions.isXCHMASCOverMax &&
-                                              mConditions.isXRSICrossedOverLongExit)
+                                              (
+                                                  //
+                                                  mConditions.isXRSICrossedOverLongExit
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXTSCurrentOverFarest &&
+                                                   mConditions.isXTSCurrentOverMediest)
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              ||
                                              //
@@ -8742,23 +8778,37 @@ bool XUSPY5XTAMHasLongSignal()
                                         //
                                         ||
                                         //
-                                        ((mConditions.isXLHHighAttachedHH &&
-                                          mConditions.isXCHMAMCFastCrossedOverSlow) &&
+                                        (mConditions.isXLHHighAttachedHH &&
                                          (
                                              //
-                                             (mConditions.isXCHMASCPeak &&
-                                              mConditions.isXCHLHSCMCHHSame)
+                                             (mConditions.isXCHLHSameHHs &&
+                                              mConditions.isXTSCurrentMax &&
+                                              mConditions.isXCHMASCOverMax &&
+                                              mConditions.isXCHLHMCLCLLSame &&
+                                              mConditions.isXLHPriceCrossedOverSignal)
                                              //
                                              ||
                                              //
-                                             ((mConditions.isXTMStartBullish &&
-                                               mConditions.isXAMAStartBullish) &&
+                                             (mConditions.isXCHMAMCFastCrossedOverSlow &&
                                               (
                                                   //
-                                                  (mConditions.isXCHLHSameHHs &&
-                                                   mConditions.isXCHMASCCrossedOverMax &&
-                                                   mConditions.isXLHPriceCrossedOverSignal &&
-                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  (mConditions.isXCHMASCPeak &&
+                                                   mConditions.isXCHLHSCMCHHSame)
+                                                  //
+                                                  ||
+                                                  //
+                                                  ((mConditions.isXTMStartBullish &&
+                                                    mConditions.isXAMAStartBullish) &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXCHLHSameHHs &&
+                                                        mConditions.isXCHMASCCrossedOverMax &&
+                                                        mConditions.isXLHPriceCrossedOverSignal &&
+                                                        mConditions.isXTSCurrentCrossedOverNearest)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
                                                   //
                                                   )
                                               //
@@ -9704,6 +9754,14 @@ bool XUSPY5XTAMHasLongSignal()
                               ((mConditions.isXCHMALCFastUnderSlow ||
                                 mConditions.isXCHMALCFastCrossedUnderSlow) &&
                                (
+                                   //
+                                   (mConditions.isXCHMAMCPeak &&
+                                    mConditions.isXTSCurrentMax &&
+                                    mConditions.isXTDBearishVale &&
+                                    mConditions.isXCHLHSCMCHHSame &&
+                                    mConditions.isXLHHighAttachedHH)
+                                   //
+                                   ||
                                    //
                                    (mConditions.isXTSCurrentUnderNearest &&
                                     (
@@ -10571,7 +10629,13 @@ bool XUSPY5XTAMHasShortSignal()
                                 mConditions.isXCHMALCFastCrossedOverSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTMBullish &&
+                                    mConditions.isXAMABullish &&
+                                    mConditions.isXCHMALCPeak &&
+                                    mConditions.isXTSCurrentOverNearest &&
+                                    mConditions.isXTSCurrentOverMediest &&
+                                    mConditions.isXTSCurrentCrossedOverNearest &&
+                                    mConditions.isXTSCurrentCrossedOverMediest)
                                    //
                                    )
                                //
@@ -10959,6 +11023,28 @@ bool XUSPY5XTAMHasShortSignal()
                                               mConditions.isXTSCurrentOverMediest &&
                                               mConditions.isXTDBullCrossedOverBear)
                                              //
+                                             ||
+                                             //
+                                             (mConditions.isXCHMAMCTrendsUp &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTSCurrentOverMediest &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXCHMAMCPeak &&
+                                                        mConditions.isXCHMALCPeak &&
+                                                        mConditions.isXCHMASCOverMax &&
+                                                        mConditions.isXCHLHMCLCHHSame &&
+                                                        mConditions.isXCHLHMCLCLLSame)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
                                              )
                                          //
                                          )
@@ -10999,7 +11085,10 @@ bool XUSPY5XTAMHasShortSignal()
                                 mConditions.isXCHMALCFastCrossedOverSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTSCurrentOverNearest &&
+                                    mConditions.isXTSCurrentOverMediest &&
+                                    mConditions.isXTMNeutural &&
+                                    mConditions.isXAMANeutural)
                                    //
                                    )
                                //
@@ -11214,6 +11303,34 @@ bool XUSPY5XTAMHasShortSignal()
                                    ((mConditions.isXCHMAMCTrendsDown &&
                                      mConditions.isXCHMAMCFastUnderSlow) &&
                                     (
+                                        //
+                                        (mConditions.isXCHMASCTrendsUp &&
+                                         (
+                                             //
+                                             (mConditions.isXTDBullOverBear &&
+                                              (
+                                                  //
+                                                  ((mConditions.isXCHMALCVale &&
+                                                    mConditions.isXTSCurrentMin &&
+                                                    mConditions.isXCHLHSCMCHHSame) &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXTMNeutural &&
+                                                        mConditions.isXAMANeutural)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
                                         //
                                         (mConditions.isXTSCurrentOverFarest &&
                                          (
@@ -12001,11 +12118,30 @@ bool XUSPY5XTAMHasShortSignal()
                                      mConditions.isXTDSignalUnderBear) &&
                                     (
                                         //
-                                        (mConditions.isXCHMAMCVale &&
-                                         mConditions.isXCHLHSameLLs &&
-                                         mConditions.isXTSCurrentMin &&
-                                         mConditions.isXCHMASCUnderMin &&
-                                         mConditions.isXCHMASCCrossedUnderMin)
+                                        (mConditions.isXTSCurrentMin &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMAMCVale &&
+                                              mConditions.isXCHLHSameLLs &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXCHMASCCrossedUnderMin)
+                                             //
+                                             ||
+                                             //
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXCHMASCCrossedUnderMax) &&
+                                              (
+                                                  //
+                                                  (!mConditions.isXCHMAMCTrendsUp &&
+                                                   !mConditions.isXCHMAMCTrendsDown)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index 3475b9be..0bb04dd9 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -7774,7 +7774,22 @@ bool XUSPY5XTAMHasLongSignal()
                                 mConditions.isXCHMASCFastCrossedUnderSlow) &&
                                (
                                    //
-                                   false
+                                   ((mConditions.isXCHMAMCTrendsDown &&
+                                     mConditions.isXCHMAMCFastOverSlow) &&
+                                    (
+                                        //
+                                        (mConditions.isXTMBearish &&
+                                         mConditions.isXAMABearish &&
+                                         mConditions.isXCHMALCPeak &&
+                                         mConditions.isXCHMASCOverMax &&
+                                         mConditions.isXCHLHMCLCHHSame &&
+                                         mConditions.isXTDBullUnderBear &&
+                                         mConditions.isXTDSignalUnderBear &&
+                                         mConditions.isXTSCurrentUnderFarest)
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -8598,10 +8613,20 @@ bool XUSPY5XTAMHasLongSignal()
                                    (mConditions.isXTDSignalUnderBear &&
                                     (
                                         //
-                                        (mConditions.isXCHMASCOverMax &&
-                                         mConditions.isXCHLHSCMCHHSame &&
-                                         mConditions.isXLHHighAttachedHH &&
-                                         mConditions.isXCHMASCCrossedOverMax)
+                                        ((mConditions.isXCHMASCOverMax &&
+                                          mConditions.isXCHLHSCMCHHSame &&
+                                          mConditions.isXLHHighAttachedHH) &&
+                                         (
+                                             //
+                                             mConditions.isXTSCurrentMax
+                                             //
+                                             ||
+                                             //
+                                             mConditions.isXCHMASCCrossedOverMax
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -8635,7 +8660,18 @@ bool XUSPY5XTAMHasLongSignal()
                                          (
                                              //
                                              (mConditions.isXCHMASCOverMax &&
-                                              mConditions.isXRSICrossedOverLongExit)
+                                              (
+                                                  //
+                                                  mConditions.isXRSICrossedOverLongExit
+                                                  //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXTSCurrentOverFarest &&
+                                                   mConditions.isXTSCurrentOverMediest)
+                                                  //
+                                                  )
+                                              //
+                                              )
                                              //
                                              ||
                                              //
@@ -8742,23 +8778,37 @@ bool XUSPY5XTAMHasLongSignal()
                                         //
                                         ||
                                         //
-                                        ((mConditions.isXLHHighAttachedHH &&
-                                          mConditions.isXCHMAMCFastCrossedOverSlow) &&
+                                        (mConditions.isXLHHighAttachedHH &&
                                          (
                                              //
-                                             (mConditions.isXCHMASCPeak &&
-                                              mConditions.isXCHLHSCMCHHSame)
+                                             (mConditions.isXCHLHSameHHs &&
+                                              mConditions.isXTSCurrentMax &&
+                                              mConditions.isXCHMASCOverMax &&
+                                              mConditions.isXCHLHMCLCLLSame &&
+                                              mConditions.isXLHPriceCrossedOverSignal)
                                              //
                                              ||
                                              //
-                                             ((mConditions.isXTMStartBullish &&
-                                               mConditions.isXAMAStartBullish) &&
+                                             (mConditions.isXCHMAMCFastCrossedOverSlow &&
                                               (
                                                   //
-                                                  (mConditions.isXCHLHSameHHs &&
-                                                   mConditions.isXCHMASCCrossedOverMax &&
-                                                   mConditions.isXLHPriceCrossedOverSignal &&
-                                                   mConditions.isXTSCurrentCrossedOverNearest)
+                                                  (mConditions.isXCHMASCPeak &&
+                                                   mConditions.isXCHLHSCMCHHSame)
+                                                  //
+                                                  ||
+                                                  //
+                                                  ((mConditions.isXTMStartBullish &&
+                                                    mConditions.isXAMAStartBullish) &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXCHLHSameHHs &&
+                                                        mConditions.isXCHMASCCrossedOverMax &&
+                                                        mConditions.isXLHPriceCrossedOverSignal &&
+                                                        mConditions.isXTSCurrentCrossedOverNearest)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
                                                   //
                                                   )
                                               //
@@ -9704,6 +9754,14 @@ bool XUSPY5XTAMHasLongSignal()
                               ((mConditions.isXCHMALCFastUnderSlow ||
                                 mConditions.isXCHMALCFastCrossedUnderSlow) &&
                                (
+                                   //
+                                   (mConditions.isXCHMAMCPeak &&
+                                    mConditions.isXTSCurrentMax &&
+                                    mConditions.isXTDBearishVale &&
+                                    mConditions.isXCHLHSCMCHHSame &&
+                                    mConditions.isXLHHighAttachedHH)
+                                   //
+                                   ||
                                    //
                                    (mConditions.isXTSCurrentUnderNearest &&
                                     (
@@ -10571,7 +10629,13 @@ bool XUSPY5XTAMHasShortSignal()
                                 mConditions.isXCHMALCFastCrossedOverSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTMBullish &&
+                                    mConditions.isXAMABullish &&
+                                    mConditions.isXCHMALCPeak &&
+                                    mConditions.isXTSCurrentOverNearest &&
+                                    mConditions.isXTSCurrentOverMediest &&
+                                    mConditions.isXTSCurrentCrossedOverNearest &&
+                                    mConditions.isXTSCurrentCrossedOverMediest)
                                    //
                                    )
                                //
@@ -10959,6 +11023,28 @@ bool XUSPY5XTAMHasShortSignal()
                                               mConditions.isXTSCurrentOverMediest &&
                                               mConditions.isXTDBullCrossedOverBear)
                                              //
+                                             ||
+                                             //
+                                             (mConditions.isXCHMAMCTrendsUp &&
+                                              (
+                                                  //
+                                                  (mConditions.isXTSCurrentOverMediest &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXCHMAMCPeak &&
+                                                        mConditions.isXCHMALCPeak &&
+                                                        mConditions.isXCHMASCOverMax &&
+                                                        mConditions.isXCHLHMCLCHHSame &&
+                                                        mConditions.isXCHLHMCLCLLSame)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
                                              )
                                          //
                                          )
@@ -10999,7 +11085,10 @@ bool XUSPY5XTAMHasShortSignal()
                                 mConditions.isXCHMALCFastCrossedOverSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTSCurrentOverNearest &&
+                                    mConditions.isXTSCurrentOverMediest &&
+                                    mConditions.isXTMNeutural &&
+                                    mConditions.isXAMANeutural)
                                    //
                                    )
                                //
@@ -11214,6 +11303,34 @@ bool XUSPY5XTAMHasShortSignal()
                                    ((mConditions.isXCHMAMCTrendsDown &&
                                      mConditions.isXCHMAMCFastUnderSlow) &&
                                     (
+                                        //
+                                        (mConditions.isXCHMASCTrendsUp &&
+                                         (
+                                             //
+                                             (mConditions.isXTDBullOverBear &&
+                                              (
+                                                  //
+                                                  ((mConditions.isXCHMALCVale &&
+                                                    mConditions.isXTSCurrentMin &&
+                                                    mConditions.isXCHLHSCMCHHSame) &&
+                                                   (
+                                                       //
+                                                       (mConditions.isXTMNeutural &&
+                                                        mConditions.isXAMANeutural)
+                                                       //
+                                                       )
+                                                   //
+                                                   )
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
                                         //
                                         (mConditions.isXTSCurrentOverFarest &&
                                          (
@@ -12001,11 +12118,30 @@ bool XUSPY5XTAMHasShortSignal()
                                      mConditions.isXTDSignalUnderBear) &&
                                     (
                                         //
-                                        (mConditions.isXCHMAMCVale &&
-                                         mConditions.isXCHLHSameLLs &&
-                                         mConditions.isXTSCurrentMin &&
-                                         mConditions.isXCHMASCUnderMin &&
-                                         mConditions.isXCHMASCCrossedUnderMin)
+                                        (mConditions.isXTSCurrentMin &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMAMCVale &&
+                                              mConditions.isXCHLHSameLLs &&
+                                              mConditions.isXCHMASCUnderMin &&
+                                              mConditions.isXCHMASCCrossedUnderMin)
+                                             //
+                                             ||
+                                             //
+                                             ((mConditions.isXCHMALCPeak &&
+                                               mConditions.isXCHMASCCrossedUnderMax) &&
+                                              (
+                                                  //
+                                                  (!mConditions.isXCHMAMCTrendsUp &&
+                                                   !mConditions.isXCHMAMCTrendsDown)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //