diff --git a/Classic/scripts/autoexec/NoBaseRapeNotify.cs b/Classic/scripts/autoexec/NoBaseRapeNotify.cs
index e82b0c1..693552f 100644
--- a/Classic/scripts/autoexec/NoBaseRapeNotify.cs
+++ b/Classic/scripts/autoexec/NoBaseRapeNotify.cs
@@ -1,11 +1,8 @@
 //Enable or Disable
 //$Host::EnableNoBaseRapeNotify = 1;
 //
+
 //Notifys the user if NoBase rape is on or off.
-
-//Set First notify varible
-$NoBaseRapeNotifyFirst = 0;
-
 function NBRStatusNotify( %game, %client, %respawn )
 {	
 	if( $CurrentMissionType $= "CTF" && $Host::EnableNoBaseRapeNotify && !$Host::TournamentMode && $Host::EvoNoBaseRapeEnabled )
@@ -26,10 +23,7 @@ function NBRStatusNotify( %game, %client, %respawn )
 				}
 				//Each corresponding time per map will get a sound.
 				else
-				{
 					messageAll('MsgNoBaseRapeNotify', '\c1No Base Rape: \c0Enabled.~wfx/misc/nexus_cap.wav');
-					//messageAll('MsgNoBaseRapeNotify', '\c1No Base Rape: \c0Enabled.');
-				}
 				
 				$NoBaseRapeNotifyCount = 0;
 			}
@@ -37,8 +31,8 @@ function NBRStatusNotify( %game, %client, %respawn )
 		//Off
 		else if( $NoBaseRapeNotifyCount !$= 1 )
 		{
-			//messageAll('MsgNoBaseRapeNotify', 'No Base Rape is \c1Disabled.~wfx/misc/diagnostic_on.wav');
 			messageAll('MsgNoBaseRapeNotify', '\c1No Base Rape: \c0Disabled.~wfx/misc/diagnostic_on.wav');
+			
 			$NoBaseRapeNotifyCount = 1;
 			$NoBaseRapeNotifyFirst = 1;
 		}
@@ -50,7 +44,7 @@ function NBRStatusNotify( %game, %client, %respawn )
 function ResetNBRNotify()
 {
 	$NoBaseRapeNotifyCount = -1;
-	$NoBaseRapeNotifyFirst = 0;
+	$NoBaseRapeNotifyFirst = -1;
 }
 
 //This function is at StaticShapeData::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType)