diff --git a/beatrun/Beatrun Reanimated/climbanim.dx80.vtx b/beatrun/Beatrun Reanimated/climbanim.dx80.vtx
index 30c00dc..5154ba2 100644
Binary files a/beatrun/Beatrun Reanimated/climbanim.dx80.vtx and b/beatrun/Beatrun Reanimated/climbanim.dx80.vtx differ
diff --git a/beatrun/Beatrun Reanimated/climbanim.dx90.vtx b/beatrun/Beatrun Reanimated/climbanim.dx90.vtx
index 8367dfc..86178fd 100644
Binary files a/beatrun/Beatrun Reanimated/climbanim.dx90.vtx and b/beatrun/Beatrun Reanimated/climbanim.dx90.vtx differ
diff --git a/beatrun/Beatrun Reanimated/climbanim.mdl b/beatrun/Beatrun Reanimated/climbanim.mdl
index 01cb08e..1f7d239 100644
Binary files a/beatrun/Beatrun Reanimated/climbanim.mdl and b/beatrun/Beatrun Reanimated/climbanim.mdl differ
diff --git a/beatrun/Beatrun Reanimated/climbanim.sw.vtx b/beatrun/Beatrun Reanimated/climbanim.sw.vtx
index 59175a8..416ec60 100644
Binary files a/beatrun/Beatrun Reanimated/climbanim.sw.vtx and b/beatrun/Beatrun Reanimated/climbanim.sw.vtx differ
diff --git a/beatrun/Beatrun Reanimated/climbanim.vvd b/beatrun/Beatrun Reanimated/climbanim.vvd
index ec3aed4..abc527b 100644
Binary files a/beatrun/Beatrun Reanimated/climbanim.vvd and b/beatrun/Beatrun Reanimated/climbanim.vvd differ
diff --git a/beatrun/Original Animations/climbanim.dx80.vtx b/beatrun/Original Animations/climbanim.dx80.vtx
index 6273526..e69af5c 100644
Binary files a/beatrun/Original Animations/climbanim.dx80.vtx and b/beatrun/Original Animations/climbanim.dx80.vtx differ
diff --git a/beatrun/Original Animations/climbanim.dx90.vtx b/beatrun/Original Animations/climbanim.dx90.vtx
index f77fc33..3263a45 100644
Binary files a/beatrun/Original Animations/climbanim.dx90.vtx and b/beatrun/Original Animations/climbanim.dx90.vtx differ
diff --git a/beatrun/Original Animations/climbanim.mdl b/beatrun/Original Animations/climbanim.mdl
index c24bcff..1eb55b3 100644
Binary files a/beatrun/Original Animations/climbanim.mdl and b/beatrun/Original Animations/climbanim.mdl differ
diff --git a/beatrun/Original Animations/climbanim.sw.vtx b/beatrun/Original Animations/climbanim.sw.vtx
index 2f23e66..8d74e83 100644
Binary files a/beatrun/Original Animations/climbanim.sw.vtx and b/beatrun/Original Animations/climbanim.sw.vtx differ
diff --git a/beatrun/Original Animations/climbanim.vvd b/beatrun/Original Animations/climbanim.vvd
index 7c0a203..85feafa 100644
Binary files a/beatrun/Original Animations/climbanim.vvd and b/beatrun/Original Animations/climbanim.vvd differ
diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx
index 30c00dc..5154ba2 100644
Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx differ
diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx
index 8367dfc..86178fd 100644
Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx differ
diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.mdl b/beatrun/gamemodes/beatrun/content/models/climbanim.mdl
index 01cb08e..1f7d239 100644
Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.mdl and b/beatrun/gamemodes/beatrun/content/models/climbanim.mdl differ
diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx
index 59175a8..416ec60 100644
Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx differ
diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.vvd b/beatrun/gamemodes/beatrun/content/models/climbanim.vvd
index ec3aed4..abc527b 100644
Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.vvd and b/beatrun/gamemodes/beatrun/content/models/climbanim.vvd differ
diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
index a340246..05459c2 100644
--- a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
@@ -145,7 +145,12 @@ local runanims = {
 	walkfwd = true,
 	crouchstill = true,
 	sprintfwd = true,
-	runbwd = true
+	runbwd = true,
+	water_swimfwd = true,
+	water_swimright = true,
+	water_swimleft = true,
+	water_swimback = true,
+	water_float = true
 }
 
 local events = {
@@ -383,7 +388,12 @@ local transitionanims = {
 	ladderclimbuprighthand = "ladderclimbuprighthandstill",
 	meleeairstill = "jumpair",
 	vaultontohigh = "runfwd",
-	snatchscar = "stand"
+	snatchscar = "stand",
+	water_swimfwd = "water_out",
+	water_swimright = "water_out",
+	water_swimleft = "water_out",
+	water_swimback = "water_out",
+	water_float = "water_out"
 }
 
 local nospinebend = {
@@ -1457,20 +1467,6 @@ local function JumpThink()
 			local moving = ply:KeyDown(IN_FORWARD) or ply:KeyDown(IN_MOVELEFT) or ply:KeyDown(IN_MOVERIGHT)
 			local back = ply:KeyDown(IN_BACK)
 
-			if ply:WaterLevel() > 0 then
-				BodyAnim:SetSequence(BodyAnim:LookupSequence("water_float"))
-
-				if ply:KeyDown(IN_MOVELEFT) and vel_l > 5 then
-					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimleft"))
-				elseif ply:KeyDown(IN_MOVERIGHT) and vel_l > 5 then
-					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimright"))
-				elseif ply:KeyDown(IN_FORWARD) and vel_l > 5 then
-					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimfwd"))
-				elseif ply:KeyDown(IN_BACK) and vel_l > 5 then
-					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimback"))
-				end
-			end
-
 			if runanims[BodyAnimString] then
 				if lastBAString == "stand" and vel_l > 0 then
 					BodyAnimCycle = ply:GetStepRight() and 0.5 or 0
@@ -1640,6 +1636,20 @@ local function JumpThink()
 				BodyAnim:SetSequence(transitionanims[BodyAnimString])
 			end
 
+			if ply:WaterLevel() > 0 then
+				BodyAnim:SetSequence(BodyAnim:LookupSequence("water_float"))
+
+				if ply:KeyDown(IN_MOVELEFT) and vel_l > 5 then
+					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimleft"))
+				elseif ply:KeyDown(IN_MOVERIGHT) and vel_l > 5 then
+					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimright"))
+				elseif ply:KeyDown(IN_FORWARD) and vel_l > 5 then
+					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimfwd"))
+				elseif ply:KeyDown(IN_BACK) and vel_l > 5 then
+					BodyAnim:SetSequence(BodyAnim:LookupSequence("water_swimback"))
+				end
+			end
+
 			if BodyAnimString == "wallrunverticalstart" or BodyAnimString == "wallrunvertical" then
 				ang = ply.WallrunOrigAng or ang
 				BodyAnimSpeed = 1.2 * math.Clamp((LocalPlayer():GetWallrunTime() - CurTime()) / 1.2, 0.5, 1)
diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Misc.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Misc.lua
index 44fe7e7..c1b751b 100644
--- a/beatrun/gamemodes/beatrun/gamemode/sh/Misc.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/sh/Misc.lua
@@ -9,7 +9,7 @@ if SERVER then
 		if not ply:IsAdmin() and not allowPropSpawn:GetBool() then return false end
 	end
 
-	for k, v in ipairs(spawn) do
+	for _, v in ipairs(spawn) do
 		hook.Add(v, "BlockSpawn", BlockSpawn)
 	end