diff --git a/addons/sourcemod/scripting/include/shavit/zones.inc b/addons/sourcemod/scripting/include/shavit/zones.inc
index 7174e208..8a281947 100644
--- a/addons/sourcemod/scripting/include/shavit/zones.inc
+++ b/addons/sourcemod/scripting/include/shavit/zones.inc
@@ -41,6 +41,8 @@ enum
 	Zone_Slide,
 	Zone_Airaccelerate,
 	Zone_Stage,
+	Zone_NoTimerGravity,
+	Zone_Gravity,
 	ZONETYPES_SIZE
 };
 
diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index 70f6b70d..f9467021 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -2478,15 +2478,39 @@ public void PreThinkPost(int client)
 		}
 
 		MoveType mtMoveType = GetEntityMoveType(client);
-
-		if (GetStyleSettingFloat(gA_Timers[client].bsStyle, "gravity") != 1.0 &&
-			(mtMoveType == MOVETYPE_WALK || mtMoveType == MOVETYPE_ISOMETRIC) &&
-			(gA_Timers[client].iLastMoveType == MOVETYPE_LADDER || GetEntityGravity(client) == 1.0))
-		{
-			SetEntityGravity(client, GetStyleSettingFloat(gA_Timers[client].bsStyle, "gravity"));
-		}
-
+		MoveType mtLast = gA_Timers[client].iLastMoveType;
 		gA_Timers[client].iLastMoveType = mtMoveType;
+
+		if (mtMoveType == MOVETYPE_WALK || mtMoveType == MOVETYPE_ISOMETRIC)
+		{
+			float g = 0.0;
+			float styleg = GetStyleSettingFloat(gA_Timers[client].bsStyle, "gravity");
+
+			if (gB_Zones)
+			{
+				if (Shavit_InsideZone(client, Zone_NoTimerGravity, gA_Timers[client].iTimerTrack))
+				{
+					return;
+				}
+
+				int id;
+
+				if (Shavit_InsideZoneGetID(client, Zone_Gravity, gA_Timers[client].iTimerTrack, id))
+				{
+					g = view_as<float>(Shavit_GetZoneData(id));
+				}
+			}
+
+			if (g == 0.0 && styleg != 1.0 && ((mtLast == MOVETYPE_LADDER || GetEntityGravity(client) == 1.0)))
+			{
+				g = styleg;
+			}
+
+			if (g != 0.0)
+			{
+				SetEntityGravity(client, g);
+			}
+		}
 	}
 }
 
diff --git a/addons/sourcemod/scripting/shavit-zones.sp b/addons/sourcemod/scripting/shavit-zones.sp
index ce08e5fc..36a59d62 100644
--- a/addons/sourcemod/scripting/shavit-zones.sp
+++ b/addons/sourcemod/scripting/shavit-zones.sp
@@ -51,7 +51,7 @@ bool gB_PrecachedStuff = false;
 
 char gS_Map[PLATFORM_MAX_PATH];
 
-char gS_ZoneNames[][] =
+char gS_ZoneNames[ZONETYPES_SIZE][] =
 {
 	"Start Zone", // starts timer
 	"End Zone", // stops timer
@@ -65,7 +65,9 @@ char gS_ZoneNames[][] =
 	"Easybhop Zone", // forces easybhop whether if the player is in non-easy styles or if the server has different settings
 	"Slide Zone", // allows players to slide, in order to fix parts like the 5th stage of bhop_arcane
 	"Custom Airaccelerate", // custom sv_airaccelerate inside this,
-	"Stage Zone" // shows time when entering zone
+	"Stage Zone", // shows time when entering zone
+	"No Timer Gravity Zone", // prevents the timer from setting gravity while inside this zone
+	"Gravity Zone", // lets you set a specific gravity while inside this zone
 };
 
 enum struct zone_settings_t
@@ -2435,6 +2437,11 @@ public int MenuHandler_SelectZoneType(Menu menu, MenuAction action, int param1,
 
 		gI_ZoneType[param1] = StringToInt(info);
 
+		if (gI_ZoneType[param1] == Zone_Gravity)
+		{
+			gI_ZoneData[param1] = view_as<int>(1.0);
+		}
+
 		ShowPanel(param1, 1);
 	}
 
@@ -2906,7 +2913,15 @@ public Action OnClientSayCommand(int client, const char[] command, const char[]
 {
 	if(gB_WaitingForChatInput[client] && gI_MapStep[client] == 3)
 	{
-		gI_ZoneData[client] = StringToInt(sArgs);
+		if (gI_ZoneType[client] == Zone_Gravity)
+		{
+			gI_ZoneData[client] = view_as<int>(StringToFloat(sArgs));
+		}
+		else
+		{
+			gI_ZoneData[client] = StringToInt(sArgs);
+		}
+
 		CreateEditMenu(client);
 
 		return Plugin_Handled;
@@ -2982,7 +2997,6 @@ void CreateEditMenu(int client)
 		FormatEx(sMenuItem, 64, "%T", "ZoneSetTPZone", client);
 		menu.AddItem("tpzone", sMenuItem);
 	}
-
 	else if(gI_ZoneType[client] == Zone_Stage)
 	{
 		FormatEx(sMenuItem, 64, "%T", "ZoneSetYes", client);
@@ -2991,7 +3005,6 @@ void CreateEditMenu(int client)
 		FormatEx(sMenuItem, 64, "%T", "ZoneSetTPZone", client);
 		menu.AddItem("tpzone", sMenuItem);
 	}
-
 	else
 	{
 		FormatEx(sMenuItem, 64, "%T", "ZoneSetYes", client);
@@ -3012,13 +3025,11 @@ void CreateEditMenu(int client)
 		FormatEx(sMenuItem, 64, "%T", "ZoneSetStage", client, gI_ZoneData[client]);
 		menu.AddItem("datafromchat", sMenuItem);
 	}
-
 	else if(gI_ZoneType[client] == Zone_Airaccelerate)
 	{
 		FormatEx(sMenuItem, 64, "%T", "ZoneSetAiraccelerate", client, gI_ZoneData[client]);
 		menu.AddItem("datafromchat", sMenuItem);
 	}
-
 	else if(gI_ZoneType[client] == Zone_CustomSpeedLimit)
 	{
 		if(gI_ZoneData[client] == 0)
@@ -3033,6 +3044,12 @@ void CreateEditMenu(int client)
 		
 		menu.AddItem("datafromchat", sMenuItem);
 	}
+	else if (gI_ZoneType[client] == Zone_Gravity)
+	{
+		float g = view_as<float>(gI_ZoneData[client]);
+		FormatEx(sMenuItem, sizeof(sMenuItem), "%T", "ZoneSetGravity", client, g);
+		menu.AddItem("datafromchat", sMenuItem);
+	}
 
 	menu.ExitButton = true;
 	menu.Display(client, 600);
diff --git a/addons/sourcemod/translations/shavit-zones.phrases.txt b/addons/sourcemod/translations/shavit-zones.phrases.txt
index 6451e627..6ec4a62c 100644
--- a/addons/sourcemod/translations/shavit-zones.phrases.txt
+++ b/addons/sourcemod/translations/shavit-zones.phrases.txt
@@ -234,6 +234,11 @@
 		"#format"	"{1:d}"
 		"en"		"Stage: {1}"
 	}
+	"ZoneSetGravity"
+	{
+		"#format"   "{1:f}"
+		"en"        "Gravity scale: {1}"
+	}
 	"ZoneEnterDataChat"
 	{
 		"en"		"Input your desired data in chat."