diff --git a/Server/Events/Key.cs b/Server/Events/Key.cs
index cbe9e732..51988b41 100644
--- a/Server/Events/Key.cs
+++ b/Server/Events/Key.cs
@@ -34,32 +34,17 @@ namespace reallife_gamemode.Server.Events
         [RemoteEvent("keyPress:N")]
         public void KeyPressN(Client player)
         {
-            if (NAPI.Player.IsPlayerInAnyVehicle(player))
+            if (player.IsInVehicle && player.VehicleSeat == -1)
             {
-                bool engineStatus = NAPI.Vehicle.GetVehicleEngineStatus(player.Vehicle);
-                if (engineStatus == false)
-                {
-                    player.Vehicle.EngineStatus = true;
-                }
-                else
-                {
-                    player.Vehicle.EngineStatus = false;
-                }
+                player.Vehicle.EngineStatus = !player.Vehicle.EngineStatus;
             }
         }
         [RemoteEvent("keyPress:X")]
         public void KeyPressX(Client player)
         {
-            if (NAPI.Player.IsPlayerInAnyVehicle(player))
+            if (player.IsInVehicle)
             {
-                if (player.Seatbelt == false)
-                {
-                    player.Seatbelt = true;
-                }
-                else
-                {
-                    player.Seatbelt = false;
-                }
+                player.Seatbelt = !player.Seatbelt;
             }
         }
     }