diff --git a/addons/hatchet_vxf_core/functions/events/vehicleChanged.sqf b/addons/hatchet_vxf_core/functions/events/vehicleChanged.sqf
index f13964e..98b9b7f 100644
--- a/addons/hatchet_vxf_core/functions/events/vehicleChanged.sqf
+++ b/addons/hatchet_vxf_core/functions/events/vehicleChanged.sqf
@@ -28,6 +28,6 @@ if (!_isVxfSetup) exitWith {
 [_newVehicle] call vxf_core_fnc_startLoops;
 vxf_vehicle = _newVehicle;
 
-vxf_interaction_vehicleSwitchedEH = _newVehicle addEventHandler ["SeatSwitched", {
-  if (_this # 1 == player) then {[player, vehicle player] call vxf_core_fnc_vehicleChanged;};
-}];
+/*vxf_interaction_vehicleSwitchedEH = ["turret", {
+  [player, vehicle player] call vxf_core_fnc_vehicleChanged;
+}, true] call CBA_fnc_addPlayerEventHandler; */
\ No newline at end of file
diff --git a/addons/hatchet_vxf_core/functions/init.sqf b/addons/hatchet_vxf_core/functions/init.sqf
index 8ed7bb7..8b9636b 100644
--- a/addons/hatchet_vxf_core/functions/init.sqf
+++ b/addons/hatchet_vxf_core/functions/init.sqf
@@ -1,2 +1,7 @@
-["vehicle", vxf_core_fnc_vehicleChanged, true] call CBA_fnc_addPlayerEventHandler;
+["vehicle", {[player, vehicle player] call vxf_core_fnc_vehicleChanged}, true] call CBA_fnc_addPlayerEventHandler;
+
+vxf_interaction_vehicleSwitchedEH = ["turret", {
+  [player, vehicle player] call vxf_core_fnc_vehicleChanged;
+}, true] call CBA_fnc_addPlayerEventHandler; 
+
 vxf_paused = false;
diff --git a/addons/hatchet_vxf_core/functions/modules/shutDownAll.sqf b/addons/hatchet_vxf_core/functions/modules/shutDownAll.sqf
index 6d5d853..9c2c3c8 100644
--- a/addons/hatchet_vxf_core/functions/modules/shutDownAll.sqf
+++ b/addons/hatchet_vxf_core/functions/modules/shutDownAll.sqf
@@ -30,5 +30,5 @@ private ["_func"];
   _x set [1, false];
 } forEach (_vehicle getVariable ["vxf_modules", []]);
 
-_vehicle removeEventHandler ["SeatSwitched", vxf_interaction_vehicleSwitchedEH];
+//["turret", vxf_interaction_vehicleSwitchedEH] call CBA_fnc_removePlayerEventHandler;
 vxf_vehicle = nil;