diff --git a/Experts/Nkanven/TheChallenger.ex5 b/Experts/Nkanven/TheChallenger.ex5
index dec76b8..a87db0f 100644
Binary files a/Experts/Nkanven/TheChallenger.ex5 and b/Experts/Nkanven/TheChallenger.ex5 differ
diff --git a/Experts/Nkanven/TheChallenger.mq5 b/Experts/Nkanven/TheChallenger.mq5
index c67b857..e55f3ba 100644
--- a/Experts/Nkanven/TheChallenger.mq5
+++ b/Experts/Nkanven/TheChallenger.mq5
@@ -60,8 +60,6 @@ void OnTick()
 
    SymbolInfoTick(_Symbol,last_tick);
 
-//isPinBar();
-
    CheckOperationHours();
    CheckPreChecks();
    ScanPositions();
@@ -82,11 +80,12 @@ void OnTick()
       return;
 
    Print("Good for trading...");
-Print("gEmergencyClose ", gEmergencyClose);
-  drawdownWatcher();
-   
-   Print("gEmergencyClose ", gEmergencyClose);
-  CloseTransactions();
+
+   if(InpActivateRiskWatcher)
+     {
+      drawdownWatcher();
+      CloseTransactions();
+     }
 
    getSignal();
    ExecuteEntry();
diff --git a/Include/Nkanven/TheChallenger/EntriesManager.mqh b/Include/Nkanven/TheChallenger/EntriesManager.mqh
index cf4faf4..e70d3f7 100644
Binary files a/Include/Nkanven/TheChallenger/EntriesManager.mqh and b/Include/Nkanven/TheChallenger/EntriesManager.mqh differ
diff --git a/Include/Nkanven/TheChallenger/Parameters.mqh b/Include/Nkanven/TheChallenger/Parameters.mqh
index 08473a5..fbcba3d 100644
--- a/Include/Nkanven/TheChallenger/Parameters.mqh
+++ b/Include/Nkanven/TheChallenger/Parameters.mqh
@@ -81,6 +81,7 @@ input double InpMinLotSize=0.01;                                        //Minimu
 input double InpMaxLotSize=100;                                         //Maximum Position Size Allowed
 input int InpMaxSpread=10;                                              //Maximum Spread Allowed
 input int InpSlippage=1;                                                //Maximum Slippage Allowed in points
+input bool InpActivateRiskWatcher=false;                                //Active risk watcher
 input ENUM_MODE_SL InpStopLossMode=SL_FIXED;                            //Stop Loss Mode
 input int InpDefaultStopLoss=200;                                       //Default Stop Loss In Points (0=No Stop Loss)
 input int InpMinStopLoss=0;                                             //Minimum Allowed Stop Loss In Points