diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 36aa86b..9377e65 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -9,16 +9,19 @@
 - [ ] Wrong Game
 - [ ] Other
 
-## Description
+## Description (Used for Multi-Region/Versioning/Wrong Game/Other)
 <!-- Describe the issues -->
 
-## Extra Information (only need to fill in if issuing for Broken Cheats)
-**Type of 3DS:** [e.g. New 3DS, Old 3DS, 2DS]
+### Fill this for problems with codes in the database
 
-**3DS Firmware Version:** [e.g. 11.6.0-39E]
+* **Title ID**:
+* **Game version**:
+* **Luma version**:
+* **Method Used (LUMAS3DS 9.0 Plugin Loader/BOOTNTR)**:
+<!-- if using luma nightly please add the first 7 digits of the nightly commit its from. example latest nightly would be "1e0996c" -->
 
-**Method Used:** [e.g. LUMAS3DS 9.0 Plugin Loader, BOOTNTR]
+### Not working codes (Used for Broken Cheat)
 
-**Game Version:** [e.g. 1.0, 1.1]
-
-**Language & Region:** [e.g. English & USA]
+* code 1
+* code 2
+* ...
\ No newline at end of file
diff --git a/Cheats/The Legend of Zelda - Ocarina of Time 3D (EUR)/0004000000033600.txt b/Cheats/The Legend of Zelda - Ocarina of Time 3D (EUR)/0004000000033600.txt
index f1b7c81..af3e101 100644
--- a/Cheats/The Legend of Zelda - Ocarina of Time 3D (EUR)/0004000000033600.txt	
+++ b/Cheats/The Legend of Zelda - Ocarina of Time 3D (EUR)/0004000000033600.txt	
@@ -1,5 +1,3 @@
-
-
 [Have All Songs]
 D9000000 00587A14
 F7000000 0003FFC0
@@ -109,14 +107,6 @@ D0000000 00000000
 [Max/Inf Arrows]
 20587A01 00000063
 
-[Moon Jump (Hold X)]
-DD000000 00000400
-198F5077 0000CB40
-
-[Move fast (Hold X)]
-DD000000 00000400
-098F722C 41A00000
-
 [Always Adult Link Voice]
 098F671C 0053A2F0
 
@@ -257,14 +247,6 @@ DD000000 00000100
 [Max/Inf Arrows]
 20587A01 00000063
 
-[Move Fast (Hold X)]
-DD000000 00000400
-098F722C 41A00000
-
-[Moon Jump (Hold X)]
-DD000000 00000400
-198F5077 0000CB40
-
 [Paper Link (Press Right D-Pad)]
 DD000000 00000010
 098F5064 3AD3D70A