diff --git a/Classes/x-saherelm.x121.setup.class.mq5 b/Classes/x-saherelm.x121.setup.class.mq5
index d760aa6b..387c43a3 100644
--- a/Classes/x-saherelm.x121.setup.class.mq5
+++ b/Classes/x-saherelm.x121.setup.class.mq5
@@ -2103,16 +2103,6 @@ struct X121SignalGenerator
             //
             result &&
             !(
-                //
-                // XSCORES ...
-                (
-                    //
-                    bearishScore < 5 &&
-                    bullishScore > bearishScore * 10
-                    //
-                    )
-                //
-                ||
                 //
                 // XMRB ...
                 (
@@ -3625,16 +3615,6 @@ struct X121SignalGenerator
             //
             result &&
             !(
-                //
-                // XSCORES ...
-                (
-                    //
-                    bullishScore < 5 &&
-                    bearishScore > bullishScore * 10
-                    //
-                    )
-                //
-                ||
                 //
                 // XMRB ...
                 (
diff --git a/Experts/x-saherelm.x121.ea.mq5 b/Experts/x-saherelm.x121.ea.mq5
index 3e496043..1ad69ff8 100644
--- a/Experts/x-saherelm.x121.ea.mq5
+++ b/Experts/x-saherelm.x121.ea.mq5
@@ -131,7 +131,7 @@ input bool x121EATerminalAlerts = false; // Terminal Alerts
 // Local Variables ...
 
 //
-bool isInTestMode = false;
+bool is121EAInTestMode = false;
 XTimeTracker x121EATimeTracker;
 
 //
@@ -158,6 +158,9 @@ int OnInit()
         return INIT_PARAMETERS_INCORRECT;
     }
 
+    //
+    is121EAInTestMode = IsRunningOnTestMode();
+
     //
     // Initializitation Succeed Message ...
     x121EA.Alert("Initialized Successfully ...");
@@ -207,7 +210,7 @@ void OnTick()
     if (x121EATimeTracker.IsNewHour())
     {
         //
-        if (!isInTestMode)
+        if (!is121EAInTestMode)
         {
             x121EA.Alert("New Hour ...");
         }
@@ -217,7 +220,7 @@ void OnTick()
     if (x121EATimeTracker.IsNewDay())
     {
         //
-        if (!isInTestMode)
+        if (!is121EAInTestMode)
         {
             x121EA.Alert("New Day ...");
         }
@@ -227,7 +230,7 @@ void OnTick()
     if (x121EATimeTracker.IsNewMonth())
     {
         //
-        if (!isInTestMode)
+        if (!is121EAInTestMode)
         {
             x121EA.Alert("New Mount ...");
         }