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 a1735d24..a142305b 100644
--- a/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/BKP/Main/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -28927,6 +28927,35 @@ bool XUSPY5XTSFIHasShortSignal()
                                                   (mConditions.isXCHLHSCMCLLSame &&
                                                    mConditions.isXTSCurrentCrossedUnderFarest)
                                                   //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXCHMASCOverMin &&
+                                                   mConditions.isXCHMASCUnderMax &&
+                                                   mConditions.isXTSCurrentCrossedUnderNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
+                                        //
+                                        ((mConditions.isXTMBearish &&
+                                          mConditions.isXAMABearish) &&
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentOverMediest &&
+                                              (
+                                                  //
+                                                  (mConditions.isXCHMAMCVale &&
+                                                   mConditions.isXLHLLIncreased &&
+                                                   mConditions.isXTMStartBearish &&
+                                                   mConditions.isXAMAStartBearish &&
+                                                   mConditions.isXCHMALCTrendsDown)
+                                                  //
                                                   )
                                               //
                                               )
@@ -29477,10 +29506,21 @@ bool XUSPY5XTSFIHasShortSignal()
                                    (mConditions.isXTSCurrentOverMediest &&
                                     (
                                         //
-                                        (mConditions.isXCHMASCVale &&
-                                         mConditions.isXCHMALCPeak &&
-                                         mConditions.isXTMNeutural &&
-                                         mConditions.isXAMANeutural)
+                                        ((mConditions.isXCHMASCVale &&
+                                          mConditions.isXCHMALCPeak) &&
+                                         (
+                                             //
+                                             (mConditions.isXTMNeutural &&
+                                              mConditions.isXAMANeutural)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTMBearish &&
+                                              mConditions.isXAMANeutural)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -29582,7 +29622,32 @@ bool XUSPY5XTSFIHasShortSignal()
                                 mConditions.isXCHMAMCFastCrossedOverSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTSCurrentOverMediest &&
+                                    (
+                                        //
+                                        ((mConditions.isXCHMALCTrendsDown &&
+                                          mConditions.isXCHMALCFastUnderSlow) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMAMCTrendsUp &&
+                                              (
+                                                  //
+                                                  (mConditions.isXCHMALCVale &&
+                                                   mConditions.isXTMNeutural &&
+                                                   mConditions.isXAMANeutural &&
+                                                   mConditions.isXCHLHSCMCHHSame)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -30052,6 +30117,12 @@ bool XUSPY5XTSFIHasShortSignal()
                                                   //
                                                   mConditions.isXTSCurrentCrossedUnderNearest
                                                   //
+                                                  ||
+                                                  //
+                                                  (!mConditions.isXCHMAMCTrendsUp &&
+                                                   !mConditions.isXCHMAMCTrendsDown &&
+                                                   mConditions.isXCHMAMCFastUnderSlow)
+                                                  //
                                                   )
                                               //
                                               )
diff --git a/Documents/Templates/Brokers List.txt b/Documents/Templates/Brokers List.txt
index 8aafa452..d30e2eb6 100644
--- a/Documents/Templates/Brokers List.txt	
+++ b/Documents/Templates/Brokers List.txt	
@@ -35,7 +35,7 @@ Resolve XUSPY5 XSI All Guard Attacks in All Markets ...
 
 XTSFI
 ------
-Resolve XUSPY5 XTSFI All Shorts Stopouts in MetaQuotes ...
+Resolve XUSPY5 XTSFI All Shorts Stopouts in AMarkets-Demo ...
 Resolve XUSPY5 XTSFI All Critical Guard Attacks in All Markets ...
 Resolve XUSPY5 XTSFI 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 a1735d24..a142305b 100644
--- a/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Projects/XUSPY5/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -28927,6 +28927,35 @@ bool XUSPY5XTSFIHasShortSignal()
                                                   (mConditions.isXCHLHSCMCLLSame &&
                                                    mConditions.isXTSCurrentCrossedUnderFarest)
                                                   //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXCHMASCOverMin &&
+                                                   mConditions.isXCHMASCUnderMax &&
+                                                   mConditions.isXTSCurrentCrossedUnderNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
+                                        //
+                                        ((mConditions.isXTMBearish &&
+                                          mConditions.isXAMABearish) &&
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentOverMediest &&
+                                              (
+                                                  //
+                                                  (mConditions.isXCHMAMCVale &&
+                                                   mConditions.isXLHLLIncreased &&
+                                                   mConditions.isXTMStartBearish &&
+                                                   mConditions.isXAMAStartBearish &&
+                                                   mConditions.isXCHMALCTrendsDown)
+                                                  //
                                                   )
                                               //
                                               )
@@ -29477,10 +29506,21 @@ bool XUSPY5XTSFIHasShortSignal()
                                    (mConditions.isXTSCurrentOverMediest &&
                                     (
                                         //
-                                        (mConditions.isXCHMASCVale &&
-                                         mConditions.isXCHMALCPeak &&
-                                         mConditions.isXTMNeutural &&
-                                         mConditions.isXAMANeutural)
+                                        ((mConditions.isXCHMASCVale &&
+                                          mConditions.isXCHMALCPeak) &&
+                                         (
+                                             //
+                                             (mConditions.isXTMNeutural &&
+                                              mConditions.isXAMANeutural)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTMBearish &&
+                                              mConditions.isXAMANeutural)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -29582,7 +29622,32 @@ bool XUSPY5XTSFIHasShortSignal()
                                 mConditions.isXCHMAMCFastCrossedOverSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTSCurrentOverMediest &&
+                                    (
+                                        //
+                                        ((mConditions.isXCHMALCTrendsDown &&
+                                          mConditions.isXCHMALCFastUnderSlow) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMAMCTrendsUp &&
+                                              (
+                                                  //
+                                                  (mConditions.isXCHMALCVale &&
+                                                   mConditions.isXTMNeutural &&
+                                                   mConditions.isXAMANeutural &&
+                                                   mConditions.isXCHLHSCMCHHSame)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -30052,6 +30117,12 @@ bool XUSPY5XTSFIHasShortSignal()
                                                   //
                                                   mConditions.isXTSCurrentCrossedUnderNearest
                                                   //
+                                                  ||
+                                                  //
+                                                  (!mConditions.isXCHMAMCTrendsUp &&
+                                                   !mConditions.isXCHMAMCTrendsDown &&
+                                                   mConditions.isXCHMAMCFastUnderSlow)
+                                                  //
                                                   )
                                               //
                                               )
diff --git a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5 b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
index a1735d24..a142305b 100644
--- a/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
+++ b/Providers/x-saherelm.xuspy5.provider.indicators.lib.mq5
@@ -28927,6 +28927,35 @@ bool XUSPY5XTSFIHasShortSignal()
                                                   (mConditions.isXCHLHSCMCLLSame &&
                                                    mConditions.isXTSCurrentCrossedUnderFarest)
                                                   //
+                                                  ||
+                                                  //
+                                                  (mConditions.isXCHMASCOverMin &&
+                                                   mConditions.isXCHMASCUnderMax &&
+                                                   mConditions.isXTSCurrentCrossedUnderNearest)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        ||
+                                        //
+                                        ((mConditions.isXTMBearish &&
+                                          mConditions.isXAMABearish) &&
+                                         (
+                                             //
+                                             (mConditions.isXTSCurrentOverMediest &&
+                                              (
+                                                  //
+                                                  (mConditions.isXCHMAMCVale &&
+                                                   mConditions.isXLHLLIncreased &&
+                                                   mConditions.isXTMStartBearish &&
+                                                   mConditions.isXAMAStartBearish &&
+                                                   mConditions.isXCHMALCTrendsDown)
+                                                  //
                                                   )
                                               //
                                               )
@@ -29477,10 +29506,21 @@ bool XUSPY5XTSFIHasShortSignal()
                                    (mConditions.isXTSCurrentOverMediest &&
                                     (
                                         //
-                                        (mConditions.isXCHMASCVale &&
-                                         mConditions.isXCHMALCPeak &&
-                                         mConditions.isXTMNeutural &&
-                                         mConditions.isXAMANeutural)
+                                        ((mConditions.isXCHMASCVale &&
+                                          mConditions.isXCHMALCPeak) &&
+                                         (
+                                             //
+                                             (mConditions.isXTMNeutural &&
+                                              mConditions.isXAMANeutural)
+                                             //
+                                             ||
+                                             //
+                                             (mConditions.isXTMBearish &&
+                                              mConditions.isXAMANeutural)
+                                             //
+                                             )
+                                         //
+                                         )
                                         //
                                         )
                                     //
@@ -29582,7 +29622,32 @@ bool XUSPY5XTSFIHasShortSignal()
                                 mConditions.isXCHMAMCFastCrossedOverSlow) &&
                                (
                                    //
-                                   false
+                                   (mConditions.isXTSCurrentOverMediest &&
+                                    (
+                                        //
+                                        ((mConditions.isXCHMALCTrendsDown &&
+                                          mConditions.isXCHMALCFastUnderSlow) &&
+                                         (
+                                             //
+                                             (mConditions.isXCHMAMCTrendsUp &&
+                                              (
+                                                  //
+                                                  (mConditions.isXCHMALCVale &&
+                                                   mConditions.isXTMNeutural &&
+                                                   mConditions.isXAMANeutural &&
+                                                   mConditions.isXCHLHSCMCHHSame)
+                                                  //
+                                                  )
+                                              //
+                                              )
+                                             //
+                                             )
+                                         //
+                                         )
+                                        //
+                                        )
+                                    //
+                                    )
                                    //
                                    )
                                //
@@ -30052,6 +30117,12 @@ bool XUSPY5XTSFIHasShortSignal()
                                                   //
                                                   mConditions.isXTSCurrentCrossedUnderNearest
                                                   //
+                                                  ||
+                                                  //
+                                                  (!mConditions.isXCHMAMCTrendsUp &&
+                                                   !mConditions.isXCHMAMCTrendsDown &&
+                                                   mConditions.isXCHMAMCFastUnderSlow)
+                                                  //
                                                   )
                                               //
                                               )