diff --git a/SharpTimer.csproj b/SharpTimer.csproj
index e92c625a..22974ec7 100644
--- a/SharpTimer.csproj
+++ b/SharpTimer.csproj
@@ -6,14 +6,14 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.330">
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.359">
       <PrivateAssets>none</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Nexd.MySQL" Version="1.0.2"/>
-    <PackageReference Include="Npgsql" Version="8.0.3"/>
-    <PackageReference Include="System.Data.SQLite" Version="1.0.118"/>
+    <PackageReference Include="Nexd.MySQL" Version="1.0.2" />
+    <PackageReference Include="Npgsql" Version="8.0.3" />
+    <PackageReference Include="System.Data.SQLite" Version="1.0.118" />
   </ItemGroup>
   <ItemGroup>
     <Content Include=".github\workflows\nightly.yml" />
@@ -34,9 +34,9 @@
   </ItemGroup>
 
   <Target Name="Date" BeforeTargets="BeforeBuild">
-    <WriteLinesToFile File="$(IntermediateOutputPath)gen.cs" Lines="static partial class CompileTimeStamp { public static long CompileTime = $([System.DateTime]::UtcNow.Ticks) %3B }" Overwrite="true"/>
+    <WriteLinesToFile File="$(IntermediateOutputPath)gen.cs" Lines="static partial class CompileTimeStamp { public static long CompileTime = $([System.DateTime]::UtcNow.Ticks) %3B }" Overwrite="true" />
     <ItemGroup>
-      <Compile Include="$(IntermediateOutputPath)gen.cs"/>
+      <Compile Include="$(IntermediateOutputPath)gen.cs" />
     </ItemGroup>
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Player/PlayerOnTick.cs b/src/Player/PlayerOnTick.cs
index 3dd7bf3c..06437294 100644
--- a/src/Player/PlayerOnTick.cs
+++ b/src/Player/PlayerOnTick.cs
@@ -93,7 +93,7 @@ public void PlayerOnTick()
 
                         if (!startzoneJumping && playerTimers[player.Slot].inStartzone)
                         {
-                            if((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.OldJumpPressed)
+                            if((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.LegacyJump.OldJumpPressed)
                             {
                                 player!.Pawn.Value!.AbsVelocity.Z = 0f;
                             }
@@ -327,7 +327,7 @@ public void PlayerOnTick()
                                                 $"{((playerButtons & PlayerButtons.Forward) != 0 ? "W" : "_")} " +
                                                 $"{((playerButtons & PlayerButtons.Moveright) != 0 ? "D" : "_")} " +
                                                 $"{((playerButtons & PlayerButtons.Back) != 0 ? "S" : "_")} " +
-                                                $"{((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.OldJumpPressed ? "J" : "_")} " +
+                                                $"{((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.LegacyJump.OldJumpPressed ? "J" : "_")} " +
                                                 $"{((playerButtons & PlayerButtons.Duck) != 0 ? "C" : "_")}";
 
 
@@ -345,7 +345,7 @@ public void PlayerOnTick()
                             player.PrintToCenterHtml(hudContent);
                         }
                         
-                        playerTimer.MovementService!.OldJumpPressed = false;
+                        playerTimer.MovementService!.LegacyJump.OldJumpPressed = false;
                     }
                 }
             }
@@ -443,10 +443,10 @@ public void SpectatorOnTick(CCSPlayerController player)
                                             $"{((playerButtons & PlayerButtons.Forward) != 0 ? "W" : "_")} " +
                                             $"{((playerButtons & PlayerButtons.Moveright) != 0 ? "D" : "_")} " +
                                             $"{((playerButtons & PlayerButtons.Back) != 0 ? "S" : "_")} " +
-                                            $"{((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.OldJumpPressed ? "J" : "_")} " +
+                                            $"{((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.LegacyJump.OldJumpPressed ? "J" : "_")} " +
                                             $"{((playerButtons & PlayerButtons.Duck) != 0 ? "C" : "_")}";
 
-                    if (playerTimer.MovementService!.OldJumpPressed == true) playerTimer.MovementService.OldJumpPressed = false;
+                    if (playerTimer.MovementService!.LegacyJump.OldJumpPressed == true) playerTimer.MovementService.LegacyJump.OldJumpPressed = false;
 
                     string hudContent = (hudEnabled ? timerLine +
                                         (VelocityHudEnabled ? veloLine : "") +