diff --git a/friendly_fire_toggle.sp b/friendly_fire_toggle.sp
index 7a86a09..51fcad4 100644
--- a/friendly_fire_toggle.sp
+++ b/friendly_fire_toggle.sp
@@ -1,10 +1,6 @@
 #include <sourcemod>
 #include <tf2>
 
-#define TOGGLE_TIME 250.0
-#define MIN_FF_DURATION 120
-#define MAX_FF_DURATION 270
-
 public Plugin myinfo = 
 {
     name = "Toggle Friendly Fire",
@@ -28,7 +24,7 @@ public Action CmdToggleFriendlyFire(int client, int args)
 {
     if (CheckCommandAccess(client, "sm_friendlyfire", ADMFLAG_ROOT))
     {
-        g_bPluginEnabled = !g_bPluginEnabled
+        g_bPluginEnabled = !g_bPluginEnabled;
 
         if (g_bPluginEnabled)
         {
@@ -72,7 +68,8 @@ void StartToggleTimer()
     if (timerToggle != null)
         KillTimer(timerToggle);
 
-    timerToggle = CreateTimer(TOGGLE_TIME, ToggleFriendlyFire);
+    float randomToggleTime = GetRandomFloat(30.0, 600.0);
+    timerToggle = CreateTimer(randomToggleTime, ToggleFriendlyFire);
 }
 
 public Action ToggleFriendlyFire(Handle timer, any data)