diff --git a/GPIE01.ini b/GPIE01.ini
index 8a1f33dd39..0d52a19849 100644
--- a/GPIE01.ini
+++ b/GPIE01.ini
@@ -2,6 +2,7 @@
 [EmuState]
 #The Emulation State as of r1062; works very well; occasionally crashes
 #The Emulation State as of r3950;  I finished it without any single crash/issue :P
+#The Emulation State as of r6465;  I finished it without any single crash/issue :P (Cheats off) Certain cheats (olimar infinite health) cause crashes
 EmulationStateId = 5
 EmulationIssues = 
 [OnFrame]
@@ -13,9 +14,7 @@ $Infinite Health: Captain Olimar
 04CE586B 08000000
 423D1E50 006C42C8
 $One Hit Kills All Enemies
-04CE586C 08000000
 04145BCC C002008C
-043F028C 00000000
 $All Areas Open
 04CE586D 08000000
 0439D980 0000001F
@@ -158,3 +157,14 @@ $Random Colors-Every Blue Pikmin
 803D1E1A 0000007F
 [Video]
 ProjectionHack = -1
+FIFOWatermarkTightness = 50
+[Gecko]
+$Stop Time From Advancing (Story Mode) [Link Master]
+040518DC 60000000
+$Stop/Return Flow of Time (L+D-pad Left/Right) (Story Mode) [Link Master]
+2839D400 00000041
+040518DC 60000000
+E2000001 80008000
+2839D400 00000042
+040518DC D0030014
+E2000001 80008000