diff --git a/main/server.cfg b/main/server.cfg
index 26aa4c6..90d26fc 100644
--- a/main/server.cfg
+++ b/main/server.cfg
@@ -538,3 +538,6 @@ set scr_empEffectsAll "0"
 
 // _perks
 set combathighIsJuiced "1"
+
+// _perkfunctions
+set onemanarmyRefillsTubes "1"
diff --git a/userraw/maps/mp/perks/_perkfunctions.gsc b/userraw/maps/mp/perks/_perkfunctions.gsc
index 9548905..6a6d201 100644
--- a/userraw/maps/mp/perks/_perkfunctions.gsc
+++ b/userraw/maps/mp/perks/_perkfunctions.gsc
@@ -12,8 +12,6 @@
 #include maps\mp\perks\_perks;
 
 
-
-
 blastshieldUseTracker( perkName, useFunc )
 {
 	self endon ( "death" );
@@ -121,8 +119,11 @@ setCombatHigh()
 	level endon( "end_game" );
 	
 	self.damageBlockedTotal = 0;
-	self.moveSpeedScaler = 1.25;
-	self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
+	if (level.combathighIsJuiced)
+	{
+		self.moveSpeedScaler = 1.25;
+		self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
+	}
 	//self visionSetNakedForPlayer( "end_game", 1 );
 
 	if ( level.splitscreen )
@@ -149,7 +150,11 @@ setCombatHigh()
 	
 	self.combatHighTimer = createTimer( "hudsmall", 1.0 );
 	self.combatHighTimer setPoint( "CENTER", "CENTER", 0, yOffset );
-	self.combatHighTimer setTimer( 7.0 );
+	if (level.combathighIsJuiced)
+		self.combatHighTimer setTimer( 7.0 );
+	else
+		self.combatHighTimer setTimer( 10.0 );
+	
 	self.combatHighTimer.color = (.8,.8,0);
 	self.combatHighTimer.archived = false;
 	self.combatHighTimer.foreground = true;
@@ -170,7 +175,10 @@ setCombatHigh()
 
 	self thread unsetCombatHighOnDeath();
 	
-	wait( 5 );
+	if (level.combathighIsJuiced)
+		wait( 5 );
+	else
+		wait( 8 );
 
 	self.combatHighIcon	fadeOverTime( 2.0 );
 	self.combatHighIcon.alpha = 0.0;
@@ -184,14 +192,17 @@ setCombatHigh()
 	wait( 2 );
 	self.damageBlockedTotal = undefined;
 
-	self.moveSpeedScaler = 1;
-
-	if (self _hasperk( "specialty_lightweight" ))
+	if (level.combathighIsJuiced)
 	{
-		self.moveSpeedScaler = 1.07;
-	}
+		self.moveSpeedScaler = 1;
 
-	self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
+		if (self _hasperk( "specialty_lightweight" ))
+		{
+			self.moveSpeedScaler = 1.07;
+		}
+
+		self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
+	}
 
 	self _unsetPerk( "specialty_combathigh" );
 }
@@ -203,11 +214,14 @@ unsetCombatHighOnDeath()
 	
 	self waittill ( "death" );
 
-	self.moveSpeedScaler = 1;
-
-	if (self _hasperk( "specialty_lightweight" ))
+	if (level.combathighIsJuiced)
 	{
-		self.moveSpeedScaler = 1.07;
+		self.moveSpeedScaler = 1;
+
+		if (self _hasperk( "specialty_lightweight" ))
+		{
+			self.moveSpeedScaler = 1.07;
+		}
 	}
 	
 	self thread _unsetPerk( "specialty_combathigh" );
@@ -220,11 +234,14 @@ unsetCombatHigh()
 	self.combatHighIcon destroy();
 	self.combatHighTimer destroy();
 
-	self.moveSpeedScaler = 1;
-
-	if (self _hasperk( "specialty_lightweight" ))
+	if (level.combathighIsJuiced)
 	{
-		self.moveSpeedScaler = 1.07;
+		self.moveSpeedScaler = 1;
+
+		if (self _hasperk( "specialty_lightweight" ))
+		{
+			self.moveSpeedScaler = 1.07;
+		}
 	}
 }
 
@@ -366,9 +383,12 @@ setLightWeight()
 {
 	self.moveSpeedScaler = 1.07;
 
-	if (self _hasperk( "specialty_combathigh" ))
+	if (level.combathighIsJuiced)
 	{
-		self.moveSpeedScaler = 1.4;
+		if (self _hasperk( "specialty_combathigh" ))
+		{
+			self.moveSpeedScaler = 1.4;
+		}
 	}
 
 	self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
@@ -620,7 +640,6 @@ selectOneManArmyClass()
 			self _disableWeaponSwitch();
 			self _disableOffhandWeapons();
 			self _disableUsability();
-
 			self switchToWeapon( self getLastWeapon() );
 			self waittill ( "weapon_change" );
 			self _enableWeaponSwitch();
@@ -693,6 +712,9 @@ giveOneManArmyClass( className )
 	self notify ( "changed_kit" );
 	level notify ( "changed_kit" );
 
+	if (level.onemanarmyRefillsTubes)
+		return;
+
 	weaponNameSize = self getCurrentWeapon().size;
 	
 	if( getSubStr( self getCurrentWeapon(), weaponNameSize - 6, weaponNameSize ) == "_gl_mp" )
diff --git a/userraw/maps/mp/perks/_perks.gsc b/userraw/maps/mp/perks/_perks.gsc
index 371561f..e6181d4 100644
--- a/userraw/maps/mp/perks/_perks.gsc
+++ b/userraw/maps/mp/perks/_perks.gsc
@@ -178,9 +178,12 @@ init()
 	level.perkSetFuncs["specialty_tacticalinsertion"] = ::setTacticalInsertion;
 	level.perkUnsetFuncs["specialty_tacticalinsertion"] = ::unsetTacticalInsertion;
 
-	setDvarIfUninitialized( "combathighIsJuiced", false );
+	setDvarIfUninitialized( "combathighIsJuiced", true );
 	level.combathighIsJuiced = getDvarInt( "combathighIsJuiced" );
 
+	setDvarIfUninitialized( "onemanarmyRefillsTubes", false );
+	level.onemanarmyRefillsTubes = getDvarInt( "onemanarmyRefillsTubes" );
+
 	initPerkDvars();
 
 	level thread onPlayerConnect();