diff --git a/scripts/_00E_KillMove.pex b/scripts/_00E_KillMove.pex
new file mode 100644
index 00000000..9015570d
Binary files /dev/null and b/scripts/_00E_KillMove.pex differ
diff --git a/scripts/_00e_a1_arcticwindsc.pex b/scripts/_00e_a1_arcticwindsc.pex
index 883acea0..a0175562 100644
Binary files a/scripts/_00e_a1_arcticwindsc.pex and b/scripts/_00e_a1_arcticwindsc.pex differ
diff --git a/scripts/_00e_a2_eyeofthestormsc.pex b/scripts/_00e_a2_eyeofthestormsc.pex
index 3b21b37b..6b6c1f39 100644
Binary files a/scripts/_00e_a2_eyeofthestormsc.pex and b/scripts/_00e_a2_eyeofthestormsc.pex differ
diff --git a/scripts/_00e_a2_eyeofthestormselfsc.pex b/scripts/_00e_a2_eyeofthestormselfsc.pex
index acf8fb03..805c06aa 100644
Binary files a/scripts/_00e_a2_eyeofthestormselfsc.pex and b/scripts/_00e_a2_eyeofthestormselfsc.pex differ
diff --git a/scripts/_00e_a2_welloflifescript.pex b/scripts/_00e_a2_welloflifescript.pex
index 25e075c6..1808d692 100644
Binary files a/scripts/_00e_a2_welloflifescript.pex and b/scripts/_00e_a2_welloflifescript.pex differ
diff --git a/scripts/_00e_disablekillmovessc.pex b/scripts/_00e_disablekillmovessc.pex
index c77b0adb..22a0ad49 100644
Binary files a/scripts/_00e_disablekillmovessc.pex and b/scripts/_00e_disablekillmovessc.pex differ
diff --git a/scripts/_00e_ephandler.pex b/scripts/_00e_ephandler.pex
index 253fd4d3..b385ffb3 100644
Binary files a/scripts/_00e_ephandler.pex and b/scripts/_00e_ephandler.pex differ
diff --git a/scripts/_00e_nq_g_07_functions.pex b/scripts/_00e_nq_g_07_functions.pex
index c44a1254..91cf444b 100644
Binary files a/scripts/_00e_nq_g_07_functions.pex and b/scripts/_00e_nq_g_07_functions.pex differ
diff --git a/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.pex b/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.pex
index 8ce5134e..87db89c1 100644
Binary files a/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.pex and b/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.pex differ
diff --git a/source/scripts/_00E_KillMove.psc b/source/scripts/_00E_KillMove.psc
new file mode 100644
index 00000000..2b8e50ed
--- /dev/null
+++ b/source/scripts/_00E_KillMove.psc
@@ -0,0 +1,35 @@
+Scriptname _00E_KillMove Hidden
+
+int Function Off() Global
+
+	GlobalVariable KillMove = Game.GetForm(0x100F19) as GlobalVariable
+	int iPrevValue = KillMove.GetValue() as int
+	
+	KillMove.SetValue(0 as float)
+	Utility.SetINIBool("bVATSDisable:VATS", true)
+
+	return iPrevValue
+	
+EndFunction
+
+int Function On() Global
+
+	GlobalVariable KillMove = Game.GetForm(0x100F19) as GlobalVariable
+	int iPrevValue = KillMove.GetValue() as int
+	
+	KillMove.SetValue(1 as float)
+	Utility.SetINIBool("bVATSDisable:VATS", false)
+
+	return iPrevValue
+
+EndFunction
+
+int function SetValue(bool bValue) Global
+
+	if bValue
+		return On()
+	else
+		return Off()
+	endif
+
+endfunction
diff --git a/source/scripts/_00e_a1_arcticwindsc.psc b/source/scripts/_00e_a1_arcticwindsc.psc
index c3c808b2..9f40c15e 100644
--- a/source/scripts/_00e_a1_arcticwindsc.psc
+++ b/source/scripts/_00e_a1_arcticwindsc.psc
@@ -8,12 +8,11 @@ Import _00E_TalentLibrary
 
 Event onEffectStart(Actor akTarget, Actor akCaster)
 
-	
 	if ((akTarget.GetLevel() - (PlayerLevel.GetValueInt())) > 4) || (akTarget.HasKeyword(MagicNoFreeze))															; Debug only!
 		_00E_A1_ArcticWind_sEnemyTooPowerful.Show()
 	Else
-			akTarget.AddSpell(_00E_A1_ArcticWindFrozenAb)
-			KillMove.SetValueInt(0)
+		akTarget.AddSpell(_00E_A1_ArcticWindFrozenAb)
+		iKillMove = _00E_KillMove.Off()
 	EndIf
 
 EndEvent
@@ -21,9 +20,7 @@ EndEvent
 Event OnEffectFinish(Actor akTarget, Actor akCaster)
 
 	akTarget.RemoveSpell(_00E_A1_ArcticWindFrozenAb)
-	If Utility.GetINIBool("bVATSDisable:VATS") == 0
-		KillMove.SetValueInt(1)
-	EndIf
+	_00E_KillMove.SetValue(iKillMove)
 	
 EndEvent
 
@@ -32,6 +29,8 @@ EndEvent
 ;              							PROPERTIES                  					 
 ;=====================================================================================
 
+int iKillMove
+
 Actor Property PlayerREF Auto
 
 Spell Property _00E_A1_ArcticWindFrozenAb Auto
@@ -43,4 +42,3 @@ GlobalVariable Property KillMove Auto
 Keyword Property MagicNoFreeze Auto
 
 GlobalVariable Property PlayerLevel Auto
-
diff --git a/source/scripts/_00e_a2_eyeofthestormsc.psc b/source/scripts/_00e_a2_eyeofthestormsc.psc
index 1ecf10ff..e9406045 100644
--- a/source/scripts/_00e_a2_eyeofthestormsc.psc
+++ b/source/scripts/_00e_a2_eyeofthestormsc.psc
@@ -21,8 +21,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 		fDurationFailsave = _00E_A2_EyeOfTheStormSP.GetNthEffectDuration(iDurationIndex)
 		iSound = MAGShoutSlowTimeActive02LP.Play(PlayerREF)
 		PlayerREF.PlaceAtMe(_00E_A2_EyeOfTheStormFailsaveExp, 1)
-		iKillMoveConfig = KillMove.GetValueInt()
-		KillMove.SetValueInt(0)
+		iKillMoveConfig = _00E_KillMove.Off()
 		akCaster.AddSpell(_00E_A2_EyeOfTheStormAb, False)
 		RegisterForSingleUpdate(fDurationFailsave)
 
@@ -41,7 +40,7 @@ Event OnEffectFinish(Actor akTarget, Actor akCaster)
 
 	if (PlayerREF.HasSpell(_00E_A2_EyeOfTheStormAb))
 		Sound.StopInstance(iSound)
-		KillMove.SetValueInt(iKillMoveConfig)
+		_00E_KillMove.SetValue(iKillMoveConfig)
 		akCaster.RemoveSpell(_00E_A2_EyeOfTheStormAb)
 	endif
 
diff --git a/source/scripts/_00e_a2_eyeofthestormselfsc.psc b/source/scripts/_00e_a2_eyeofthestormselfsc.psc
index a2d7c7ee..c9ef0d64 100644
--- a/source/scripts/_00e_a2_eyeofthestormselfsc.psc
+++ b/source/scripts/_00e_a2_eyeofthestormselfsc.psc
@@ -8,7 +8,7 @@ Import _00E_TalentLibrary
 
 Event OnEffectStart(Actor Target, Actor Caster)
 
-	KillMove.SetValueInt(0)
+	iKillMove = _00E_KillMove.Off()
 	AudioCategoryPausedDuringMenu.Mute()
 	_00E_A2_EyeOfTheStormIMOD.Apply()	
 
@@ -17,9 +17,7 @@ EndEvent
 
 Event OnEffectFinish(Actor akTarget, Actor akCaster)
 
-	If Utility.GetINIBool("bVATSDisable:VATS") == 0
-		KillMove.SetValueInt(1)
-	EndIf
+	_00E_KillMove.SetValue(iKillMove)
 	_00E_A2_EyeOfTheStormIMOD.Remove()
 	AudioCategoryPausedDuringMenu.UnMute()
 
@@ -30,6 +28,8 @@ EndEvent
 ;              							PROPERTIES                					 
 ;=====================================================================================
 
+int iKillMove
+
 ImagespaceModifier Property _00E_A2_EyeOfTheStormIMOD Auto
 
 Actor Property PlayerREF Auto
diff --git a/source/scripts/_00e_a2_welloflifescript.psc b/source/scripts/_00e_a2_welloflifescript.psc
index 87769aa6..f0d0eead 100644
--- a/source/scripts/_00e_a2_welloflifescript.psc
+++ b/source/scripts/_00e_a2_welloflifescript.psc
@@ -17,7 +17,7 @@ EndEvent
 
 Event OnEffectStart(Actor akTarget, Actor akCaster)
 
-	KillMove.SetValue(0)
+	iKillMove = _00E_KillMove.Off()
 	MAGPowerRacialHitskinM.Play(PlayerREF)
 	AudioCategorySFXDeath.Mute()
 	PlayerREF.GetActorBase().SetEssential(True)
@@ -29,14 +29,10 @@ Event OnEffectFinish(Actor akTarget, Actor akCaster)
 
 	AudioCategorySFXDeath.UnMute()
 	PlayerREF.GetActorBase().SetEssential(False)
-	UnregisterForUpdate()
+	_00E_KillMove.SetValue(iKillMove)
 	
 EndEvent
 
-Event OnUpdate()
-
-	
-EndEvent
 
 ;=====================================================================================
 ;              							FUNCTIONS                 					 
@@ -100,6 +96,7 @@ EndFunction
 ;              							PROPERTIES                					 
 ;=====================================================================================
 
+int iKillMove
 float iTriggerHealthPercentage
 
 Explosion Property _00E_A2_WellOfLifeExplosionVisual Auto
diff --git a/source/scripts/_00e_disablekillmovessc.psc b/source/scripts/_00e_disablekillmovessc.psc
index b4e972cc..3818bc3a 100644
--- a/source/scripts/_00e_disablekillmovessc.psc
+++ b/source/scripts/_00e_disablekillmovessc.psc
@@ -2,20 +2,18 @@ Scriptname _00E_DisableKillMovesSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == Game.GetPlayer()
-		KillMove.SetValueInt(0)
+	if akActionRef == Game.GetForm(0x14)
+		iKillMove = _00E_KillMove.Off()
 	EndIf
 
 EndEvent
 
 Event OnTriggerLeave(ObjectReference akActionRef)
 
-	if akActionRef == Game.GetPlayer()
-		If Utility.GetINIBool("bVATSDisable:VATS") == 0
-			KillMove.SetValueInt(1)
-		EndIf
+	if akActionRef == Game.GetForm(0x14)
+		_00E_KillMove.SetValue(iKillMove)
 	EndIf
 
 EndEvent
 
-GlobalVariable Property KillMove Auto
\ No newline at end of file
+int iKillMove
diff --git a/source/scripts/_00e_ephandler.psc b/source/scripts/_00e_ephandler.psc
index 251ffd7c..91d40aaf 100644
--- a/source/scripts/_00e_ephandler.psc
+++ b/source/scripts/_00e_ephandler.psc
@@ -1,4 +1,4 @@
-Scriptname _00E_EPHandler
+Scriptname _00E_EPHandler Hidden
 
 Function GiveEP(int ToGive) Global
 
diff --git a/source/scripts/_00e_nq_g_07_functions.psc b/source/scripts/_00e_nq_g_07_functions.psc
index 7b467987..2afdd407 100644
--- a/source/scripts/_00e_nq_g_07_functions.psc
+++ b/source/scripts/_00e_nq_g_07_functions.psc
@@ -449,18 +449,6 @@ Function DijaamAttackPlayer()
 
 EndFunction
 
-Function ToggleKillmoves()
-
-	if KillMove.GetValue() == 1
-		bKillMovesDeactivated = true
-		KillMove.SetValue(0)
-	ElseIf KillMove.GetValue() == 0 && bKillMovesDeactivated == true
-		bKillMovesDeactivated = false
-		KillMove.SetValue(1)
-	EndIf
-
-EndFunction
-
 Function DijaamLeave()
 
 	FadeToBlackIMOD.Apply()
diff --git a/source/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.psc b/source/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.psc
index c99b304a..e7afafcd 100644
--- a/source/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.psc
+++ b/source/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.psc
@@ -23,7 +23,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
 ;BEGIN CODE
-NQ_G_07.ToggleKillmoves()
+; 2.1: toggling killmove removed
 ;END CODE
 EndFunction
 ;END FRAGMENT