diff --git a/Vision fix.esp b/Vision fix.esp
new file mode 100644
index 00000000..257b65d5
Binary files /dev/null and b/Vision fix.esp differ
diff --git a/scripts/_00E_VisionControl.pex b/scripts/_00E_VisionControl.pex
index 5c2b7107..96e9814c 100644
Binary files a/scripts/_00E_VisionControl.pex and b/scripts/_00E_VisionControl.pex differ
diff --git a/scripts/_00e_mq05_functions.pex b/scripts/_00e_mq05_functions.pex
index 53afda51..71bea81b 100644
Binary files a/scripts/_00e_mq05_functions.pex and b/scripts/_00e_mq05_functions.pex differ
diff --git a/scripts/_00e_mq16_functions.pex b/scripts/_00e_mq16_functions.pex
index 14abfd26..7620f1bb 100644
Binary files a/scripts/_00e_mq16_functions.pex and b/scripts/_00e_mq16_functions.pex differ
diff --git a/source/scripts/_00E_VisionControl.psc b/source/scripts/_00E_VisionControl.psc
index 668dec87..abac02f6 100644
--- a/source/scripts/_00E_VisionControl.psc
+++ b/source/scripts/_00E_VisionControl.psc
@@ -26,7 +26,7 @@ Function VisionEffectTimestop(bool bSilent = False, bool bCustomImod = False, bo
 		_00E_VisionStartTimestopIMOD.Apply()
 		_00E_VisionImod.ApplyCrossFade(0.25)
 	EndIf
-	
+
 	PlayerREF.AddSpell(_00E_Vision_TimeSpell, False)
 	
 	if !bCustomMusic
@@ -34,10 +34,11 @@ Function VisionEffectTimestop(bool bSilent = False, bool bCustomImod = False, bo
 	EndIf
 	
 	MagRacialBattlecryFire.Play(PlayerREF)
-	fPlayerSpeedBeforeVision = PlayerREF.GetActorValue("SpeedMult")
+	fPlayerSpeedBeforeVision = PlayerREF.GetBaseActorValue("SpeedMult")
 	PlayerREF.SetActorValue("SpeedMult", 35)
 	UpdateSpeed(PlayerREF)
 	
+	VisionSound = 0
 	If !bSilent
 		VisionSound = _00E_VisionLPM.Play(PlayerREF)
 	EndIf
@@ -58,15 +59,8 @@ EndFunction
 
 Function VisionEffectTimestopStop(bool bMovementHasBeenLocked = False)
 
-	float fSpeedMultBefore = PlayerREF.GetActorValue("speedMult")
-
-	PlayerREF.SetGhost(False)
 	Game.DisablePlayerControls()
-	PlayerREF.SetActorValue("SpeedMult", PlayerSpeed)
-	PlayerREF.SetGhost(False)
 	AudioCategoryFST.UnMute()
-	UpdateSpeed(PlayerREF)
-	Game.ShowFirstPersonGeometry(True)
 	
 	If !bMovementHasBeenLocked
 		If PlayerVisionFailsaveMarker.GetDistance(PlayerREF) <= 1000
@@ -76,10 +70,11 @@ Function VisionEffectTimestopStop(bool bMovementHasBeenLocked = False)
 		EndIf
 	EndIf
 	
-	PlayerREF.SetGhost(False)
-	Sound.StopInstance(VisionSound)
+	if VisionSound
+		Sound.StopInstance(VisionSound)
+		VisionSound = 0
+	endif
 	MAGConjurePortalClose.Play(PlayerREF)
-	_00E_SilenceAbruptHighPriority.Remove()
 	PlayerREF.RemoveSpell(_00E_Vision_TimeSpell)
 	_00E_VisionShaderParticles.Remove(0.5)
 	_00E_VisionEndImod.ApplyCrossFade(1)
@@ -92,9 +87,10 @@ Function VisionEffectTimestopStop(bool bMovementHasBeenLocked = False)
 
 	UpdateSpeed(PlayerREF)
 	Game.EnablePlayerControls()
-	Game.SetPlayerAIDriven(0)
+	Game.SetPlayerAIDriven(false)
 	Game.ShowFirstPersonGeometry(True)
 	_00E_SilenceAbruptHighPriority.Remove()
+	PlayerREF.SetGhost(False)
 	
 EndFunction
 
@@ -223,7 +219,6 @@ float fPlayerSpeedBeforeVision
 ObjectReference Property PlayerVisionStartMarker Auto Hidden
 ObjectReference Property PlayerVisionFailsaveMarker Auto
 
-float PlayerSpeed
 int VisionSound
 
 SPELL Property _00E_Vision_TimeSpell  Auto  
diff --git a/source/scripts/_00e_mq05_functions.psc b/source/scripts/_00e_mq05_functions.psc
index a8fc20bc..7dc6c33b 100644
--- a/source/scripts/_00e_mq05_functions.psc
+++ b/source/scripts/_00e_mq05_functions.psc
@@ -64,10 +64,7 @@ EndFunction
 Function StopVision()
 
     _00E_PlayerFunctions.GetVisionControl().VisionEffectTimestopStop()
-    _00E_PlayerFunctions.GetVisionControl().UpdateSpeed(PlayerREF)
     MQ05_SC3_Vision.Stop()
-    Game.EnablePlayerControls()
-    Game.SetPlayerAIDriven(False)
     
 EndFunction
 
diff --git a/source/scripts/_00e_mq16_functions.psc b/source/scripts/_00e_mq16_functions.psc
index e67d8829..3a9a2654 100644
--- a/source/scripts/_00e_mq16_functions.psc
+++ b/source/scripts/_00e_mq16_functions.psc
@@ -527,9 +527,9 @@ EndFunction
 
 Function PrepareVision_SC10()
 
-    MQ16_SC10_VisionLinker.Enable()
-    Wait(1)
     MQ16_SC10_VisionPriestess.Kill(MQ16_SC10_VisionPriestess)
+    MQ16_SC10_VisionLinker.Enable()
+    MQ16_SC10_VisionPriestess.MoveToMyEditorLocation() ; otherwise snaps to navmesh
     
 EndFunction