diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH1Z.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH1Z.hpp
index dc211b835..669ddb0b3 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH1Z.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH1Z.hpp
@@ -13,11 +13,11 @@ class AH1Z_DZ: AH1Z {
 	supplyRadius = 1.3;
 	
 	class Turrets;
-	class MainTurret;
+	class MainTurret;	
 	
-	class DefaultEventhandlers;
 	class EventHandlers: DefaultEventhandlers
 	{
+		fired = "_this call BIS_Effects_EH_Fired;";
 		killed = "_this call BIS_Effects_EH_Killed;";
 		engine = "if (_this select 1) then {(_this select 0) animate ['mainrotor_folded',1]; (_this select 0) animate ['mainrotor_unfolded',0]; (_this select 0) animate ['rotorshaft_unfolded',0];} else {_this select 0 setVariable ['engineOffTime',diag_tickTime,false];};"; //Unfold
 	};
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp
index abc2a3618..cac464cf4 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp
@@ -20,12 +20,6 @@ class AH6J_EP1_DZ: AH6J_EP1
 	fuelCapacity = 242;
 	supplyRadius = 1.3;
 	radartype = 0;
-	class DefaultEventhandlers;
-	class EventHandlers: DefaultEventhandlers
-	{
-		killed = "_this call BIS_Effects_EH_Killed;";
-		fired = "_this call BIS_Effects_EH_Fired;";
-	};	
 };
 
 class AH6J_EP1_DZE: AH6J_EP1_DZ
@@ -93,13 +87,7 @@ class AH6X_DZ: AH6X_EP1 {
 	fuelCapacity = 242;
 	radartype = 0;
 	supplyRadius = 1.3;
-
 	class Turrets {};
-	class DefaultEventhandlers;
-	class EventHandlers: DefaultEventhandlers
-	{
-		killed = "_this call BIS_Effects_EH_Killed;";
-	};
 	
 	class Upgrades
 	{
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH53.hpp
index 71f16a254..e91803c02 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH53.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH53.hpp
@@ -30,9 +30,13 @@ class CH53_DZE : USEC_ch53_E {
 	transportMaxMagazines = 250;
 	transportmaxbackpacks = 15;
 	fuelCapacity = 3849;
-	class eventhandlers {
-		killed = "_this spawn BIS_Effects_EH_Killed;";
-	};
+	
+	class EventHandlers: DefaultEventhandlers
+	{
+		fired = "_this call BIS_Effects_EH_Fired;";
+		killed = "_this call BIS_Effects_EH_Killed;";
+	};	
+
 	class UserActions {
 		class RampOpen {
 			displayName = $STR_EPOCH_OPEN_RAMP;
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CSJ_GyroAC.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CSJ_GyroAC.hpp
index 81252e07d..dd8bd6d29 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CSJ_GyroAC.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CSJ_GyroAC.hpp
@@ -116,10 +116,10 @@ class CSJ_GyroP: Plane
 		class PushPlane {ACTION_PUSH;};
 		//class Repair {ACTION_REPAIR; radius = 4;};
 		//class Salvage {ACTION_SALVAGE; radius = 4;};
-	};
-	class DefaultEventhandlers;
-	class EventHandlers: DefaultEventhandlers
+	};	
+	class Eventhandlers: DefaultEventhandlers
 	{
+		fired = "_this call BIS_Effects_EH_Fired;";
 		killed = "_this call BIS_Effects_EH_Killed;";
 	};
 	class Sounds
@@ -228,9 +228,9 @@ class CSJ_GyroC: Helicopter
 		//class Repair {ACTION_REPAIR; radius = 4;};
 		//class Salvage {ACTION_SALVAGE; radius = 4;};
 	};
-	class DefaultEventhandlers;
-	class EventHandlers: DefaultEventhandlers
+	class Eventhandlers: DefaultEventhandlers
 	{
+		fired = "_this call BIS_Effects_EH_Fired;";
 		killed = "_this call BIS_Effects_EH_Killed;";
 	};
 	class Sounds
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/Pook.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/Pook.hpp
index 3b3339251..6cb79c65c 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/Pook.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/Pook.hpp
@@ -24,11 +24,6 @@ class pook_H13_base_DZE: pook_H13_base
 	hideWeaponsCargo = 0;
 	fuelCapacity = 450;
 	supplyRadius = 1.3;
-	class DefaultEventhandlers;
-	class EventHandlers: DefaultEventhandlers
-	{
-		killed = "_this call BIS_Effects_EH_Killed;";
-	};
 };
 
 class pook_medevac_DZE: pook_H13_base_DZE
@@ -182,13 +177,6 @@ class pook_gunship_DZ:  pook_H13_base_DZE
 	selectionFireAnim = "zasleh";
 	weapons[] = {"pook_M60_dual","pook_H13Grenades","CMFlareLauncher"};
 	magazines[] = {"pook_1300Rnd_762x51_M60","pook_12Rnd_Grenade_Camel","60Rnd_CMFlareMagazine","60Rnd_CMFlareMagazine"};
-
-	class DefaultEventhandlers;
-	class Eventhandlers: DefaultEventhandlers
-	{
-		killed = "_this call BIS_Effects_EH_Killed;";
-		fired = "_this call BIS_Effects_EH_Fired;";
-	};
 };
 
 class pook_gunship_DZE: pook_gunship_DZ
@@ -309,13 +297,6 @@ class pook_transport_DZ: pook_H13_transport
 	
 	class Turrets; // External class reference
 	class MainTurret; // External class reference
-
-	class DefaultEventhandlers;
-	class Eventhandlers: DefaultEventhandlers
-	{
-		killed = "_this call BIS_Effects_EH_Killed;";
-		fired = "_this call BIS_Effects_EH_Fired;";
-	};
 };
 
 class pook_transport_DZE: pook_transport_DZ
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp
index fd4a4d25e..923ef9089 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp
@@ -83,11 +83,11 @@ class UH1Y_DZ: UH1_Base {
 				};
 			};
 		};
-	};
+	};	
 
-	class DefaultEventhandlers;
 	class EventHandlers: DefaultEventhandlers
 	{
+		fired = "_this call BIS_Effects_EH_Fired;";
 		killed = "_this call BIS_Effects_EH_Killed;";
 		engine = "if (_this select 1) then {(_this select 0) animate ['mainrotor_folded',1]; (_this select 0) animate ['mainrotor_unfolded',0];} else {_this select 0 setVariable ['engineOffTime',diag_tickTime,false];};"; //Unfold
 	};
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp b/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp
index f35d52362..b0778fb32 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp
@@ -15,9 +15,9 @@ class MV22_DZ : MV22 {
 	transportMaxMagazines = 400;
 	transportmaxbackpacks = 10;
 	fuelCapacity = 6513;
-	class DefaultEventhandlers;
 	class EventHandlers: DefaultEventhandlers
 	{
+		fired = "_this call BIS_Effects_EH_Fired;";
 		killed = "_this call BIS_Effects_EH_Killed;";
 		engine = "if (_this select 1) then {{_this select 0 animate [_x,0]} count ['engine_prop_1_1_turn','engine_prop_1_2_turn','engine_prop_1_3_turn','engine_prop_2_1_turn','engine_prop_2_2_turn','engine_prop_2_3_turn','engine_prop_1_1_close','engine_prop_1_3_close','engine_prop_2_1_close','engine_prop_2_2_close','pack_engine_1','pack_engine_2','turn_wing'];} else {_this select 0 setVariable ['engineOffTime',diag_tickTime,false];};"; //Unfold
 	};