diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm
index 66151f83..49820046 100644
Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ
diff --git a/Moved startup quest.esp b/Moved startup quest.esp
new file mode 100644
index 00000000..a1827ad1
Binary files /dev/null and b/Moved startup quest.esp differ
diff --git a/Skyrim.esm b/Skyrim.esm
index fbc89239..9cb5de5b 100644
Binary files a/Skyrim.esm and b/Skyrim.esm differ
diff --git a/scripts/_00E_MQ101_QuickStart.pex b/scripts/_00E_MQ101_QuickStart.pex
new file mode 100644
index 00000000..e124c3b3
Binary files /dev/null and b/scripts/_00E_MQ101_QuickStart.pex differ
diff --git a/scripts/_00e_mqp01_startsc.pex b/scripts/_00e_mqp01_startsc.pex
deleted file mode 100644
index f7579bee..00000000
Binary files a/scripts/_00e_mqp01_startsc.pex and /dev/null differ
diff --git a/scripts/qf_mq101.pex b/scripts/qf_mq101.pex
index 525dc5e2..1cc4512e 100644
Binary files a/scripts/qf_mq101.pex and b/scripts/qf_mq101.pex differ
diff --git a/scripts/scriptarchiveorder.txt b/scripts/scriptarchiveorder.txt
index 42a2f912..22995ea6 100644
--- a/scripts/scriptarchiveorder.txt
+++ b/scripts/scriptarchiveorder.txt
@@ -263,6 +263,7 @@ scripts\fs_nq05_tochterdeadscript.pex
 scripts\fs_nqr04_secretslot_sc.pex
 scripts\fs_nqr05_bossfightabnormalitysc.pex
 scripts\fs_nqr05_questfragments.pex
+scripts\_00E_MQ101_QuickStart.pex
 scripts\_00_complexsetstageonread.pex
 scripts\_00e_38e_uniyogoshsc.pex
 scripts\_00e_a0_actiontrigger_myradflight.pex
@@ -1100,7 +1101,6 @@ scripts\_00e_mq18b_showthoughtmessagesc.pex
 scripts\_00e_mqp01_carbossc.pex
 scripts\_00e_mqp01_functions.pex
 scripts\_00e_mqp01_playertranslationscript.pex
-scripts\_00e_mqp01_startsc.pex
 scripts\_00e_mqp02_combatfailsafesc.pex
 scripts\_00e_mqp02_functions.pex
 scripts\_00e_mqp02_lanternscript.pex
diff --git a/source/scripts/_00E_MQ101_QuickStart.psc b/source/scripts/_00E_MQ101_QuickStart.psc
new file mode 100644
index 00000000..44116b10
--- /dev/null
+++ b/source/scripts/_00E_MQ101_QuickStart.psc
@@ -0,0 +1,36 @@
+Scriptname _00E_MQ101_QuickStart extends Quest  
+
+function Init()
+
+	MQP01.CompleteAllObjectives()
+	MQP01.CompleteQuest()
+	MQP02.CompleteAllObjectives()
+	MQP02.CompleteQuest()
+
+	Utility.wait(0.5)
+
+	If _00E_VideoSkip.GetValueInt() == 0 && EnderalFunctions.VideoSupport()
+		Game.PlayBink("MQP03NearDeathExperience.bik", true)
+	EndIf
+
+	Actor PlayerREF = Game.GetForm(0x14) as Actor
+	PlayerREF.MoveTo(_00E_ClassMenuOrigin)
+
+	Debug.SendAnimationEvent(PlayerRef, "IdleForceDefaultState")
+	Game.ShowRaceMenu()
+	(MQP02 as _00E_MQP02_Functions).AddRacialAbilites()
+
+	bool bDisableFighting = SKSE.GetVersion() > 0 && ! EnderalFunctions.IsVR()
+	Game.DisablePlayerControls(false, bDisableFighting, true, false, true, false, false, true)
+
+	MQP03.SetCurrentStageID(15)
+
+endfunction
+
+Quest Property MQP01  Auto  
+Quest Property MQP02  Auto  
+Quest Property MQP03  Auto  
+
+GlobalVariable Property _00E_VideoSkip  Auto  
+
+ObjectReference Property _00E_ClassMenuOrigin  Auto  
diff --git a/source/scripts/_00e_mqp01_startsc.psc b/source/scripts/_00e_mqp01_startsc.psc
deleted file mode 100644
index a6b27287..00000000
--- a/source/scripts/_00e_mqp01_startsc.psc
+++ /dev/null
@@ -1,47 +0,0 @@
-Scriptname _00E_MQP01_StartSC extends ObjectReference  
-
-Event OnTriggerEnter (ObjectReference akActionREF)
-
-	if akActionRef == PlayerREF && !bDone
-		bDone = true
-		Disable()
-		If ! MQP01.IsCompleted() && MQ10a.GetCurrentStageID() != 5 && !MQ10a.IsRunning() && !MQ12c.IsRunning()
-			if _00E_QuickStartPrompt.Show() > 0
-				MQP01.CompleteAllObjectives()
-				MQP01.CompleteQuest()
-				MQP02.CompleteAllObjectives()
-				MQP02.CompleteQuest()
-				Utility.wait(0.5)
-				If _00E_VideoSkip.GetValueInt() == 0 && EnderalFunctions.VideoSupport()
-					Game.PlayBink("MQP03NearDeathExperience.bik", true)
-				EndIf
-				PlayerREF.MoveTo(_00E_ClassMenuOrigin)
-				Debug.SendAnimationEvent(PlayerRef, "IdleForceDefaultState")
-				Game.ShowRaceMenu()
-				bool bDisableFighting = SKSE.GetVersion() > 0 && ! EnderalFunctions.IsVR()
-				Game.DisablePlayerControls(false, bDisableFighting, true, false, true, false, false, true)
-				MQP03.SetCurrentStageID(15)
-				(MQP02 as _00E_MQP02_Functions).AddRacialAbilites()
-			else
-				MQP01.SetCurrentStageID(10)
-			endif
-		EndIf
-	EndIf
-
-EndEvent
-
-bool bDone
-
-Quest Property MQP01 Auto 
-Quest Property MQP02 Auto  
-Quest Property MQP03 Auto  
-Quest Property MQ12c Auto 
-Quest Property MQ10a Auto 
-
-Actor Property PlayerREF Auto
-
-Message Property _00E_QuickStartPrompt  Auto  
-
-ObjectReference Property _00E_ClassMenuOrigin  Auto  
-
-GlobalVariable Property _00E_VideoSkip Auto
diff --git a/source/scripts/qf_mq101.psc b/source/scripts/qf_mq101.psc
index f9a2a6bb..a99c7808 100644
--- a/source/scripts/qf_mq101.psc
+++ b/source/scripts/qf_mq101.psc
@@ -17,11 +17,18 @@ Actor PlayerREF = Game.GetForm(0x14) as Actor
 PlayerREF.RemoveAllItems(none, false, false)
 PlayerREF.MoveTo(PlayerStartMarkerNew)
 PlayerStartMarkerNew = None
+Utility.Wait(0.2)
 
 if SKSE.GetVersion() > 0 && EnderalFunctions.GetNewGameCount() > 1
 	Game.QuitToMainMenu()
 	Debug.MessageBox("Due to an engine bug, new game should not be started after quitting to the main menu. Please, restart Enderal first.")
 endif
+
+if _00E_QuickStartPrompt.Show() > 0
+	QuickStartQuest.Init()
+else
+	MQP01.SetCurrentStageID(10)
+endif
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -29,3 +36,9 @@ EndFunction
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment
 
 ObjectReference Property PlayerStartMarkerNew Auto
+
+Quest Property MQP01  Auto  
+
+Message Property _00E_QuickStartPrompt  Auto  
+
+_00E_MQ101_QuickStart Property QuickStartQuest  Auto