diff --git a/region/lowernorfair/east/Red Kihunter Shaft.json b/region/lowernorfair/east/Red Kihunter Shaft.json
index 49d62b9b3..c51eca9bb 100644
--- a/region/lowernorfair/east/Red Kihunter Shaft.json	
+++ b/region/lowernorfair/east/Red Kihunter Shaft.json	
@@ -956,6 +956,35 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "id": 72,
+      "link": [3, 5],
+      "name": "Kihunter Manipulation from Middle Door",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        {"notable": "Kihunter Manipulation from Middle Door"},
+        "canDash",
+        "canStopOnADime",
+        "canTrickyDodgeEnemies",
+        {"or": [
+          "HiJump",
+          "canWalljump"
+        ]},
+        {"heatFrames": 570}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Manipulate the Three Kihunters to avoid all of them when entering the room from the middle door.",
+        "Stop on a dime on entry for positioning, because it is precise.",
+        "Wait 1 second then run or Morph and roll left, past the swooping kihunter.",
+        "Quickly jump to the higher level and run into the left wall.",
+        "Wait there for half a second; it helps to jump into the wall.",
+        "The 2 Kihunters should be grouped above Samus and out of the way."
+      ]
+    },
     {
       "id": 27,
       "link": [3, 5],
@@ -1156,6 +1185,9 @@
       "id": 35,
       "link": [3, 7],
       "name": "Kihunter Dodge (Bottom)",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
       "requires": [
         {"notable": "Kihunter Dodge"},
         "canTrickyDodgeEnemies",
@@ -1165,32 +1197,6 @@
       "blueSuitChecked": true,
       "note": "The Kihunter can be baited by jumping into the door then walking left."
     },
-    {
-      "id": 36,
-      "link": [3, 7],
-      "name": "Kihunter Manipulation from Middle Door (Bottom)",
-      "requires": [
-        {"notable": "Kihunter Manipulation from Middle Door"},
-        "canStopOnADime",
-        "canDash",
-        "canTrickyDodgeEnemies",
-        {"or": [
-          "HiJump",
-          "canWalljump"
-        ]},
-        {"heatFrames": 80}
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": [
-        "Manipulate the Three Kihunters to avoid all of them when entering the room from the Save room door.",
-        "Stop on a dime on entry for positioning, because it is precise.",
-        "Wait 1 second then run or Morph and roll left, past the swooping kihunter.",
-        "Quickly jump to the higher level and run into the left wall.",
-        "Wait there for half a second; it helps to jump into the wall.",
-        "The 2 Kihunters should be grouped above Samus and out of the way."
-      ]
-    },
     {
       "id": 95,
       "link": [4, 1],
@@ -2093,40 +2099,13 @@
         {"notable": "Kihunter Dodge"},
         "canDash",
         "canTrickyDodgeEnemies",
-        {"heatFrames": 710}
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": [
-        "The Middle Kihunter can be jumped past by waiting for the right timing, if it is in the way.",
-        "Wait for the top Kihunter to exit the corridor and wait just below so that it will bonk the wall when it attempts to swoop, then jump past.",
-        "It is possible the two Kihunters group up in the middle which may not be possible to pass without taking damage."
-      ]
-    },
-    {
-      "id": 72,
-      "link": [7, 5],
-      "name": "Kihunter Manipulation from Middle Door (Top)",
-      "requires": [
-        {"notable": "Kihunter Manipulation from Middle Door"},
-        "canDash",
-        "canStopOnADime",
-        "canTrickyDodgeEnemies",
-        {"or": [
-          "HiJump",
-          "canWalljump"
-        ]},
-        {"heatFrames": 490}
+        {"heatFrames": 610}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
       "note": [
-        "Manipulate the Three Kihunters to avoid all of them when entering the room from the Save room door.",
-        "Stop on a dime on entry for positioning, because it is precise.",
-        "Wait 1 second then run or Morph and roll left, past the swooping kihunter.",
-        "Quickly jump to the higher level and run into the left wall.",
-        "Wait there for half a second; it helps to jump into the wall.",
-        "The 2 Kihunters should be grouped above Samus and out of the way."
+        "Wait near the left wall for a brief time for the middle area to be clear of Kihunters.",
+        "If the top Kihunter is above, wait for it to exit the corridor and avoid its lunge and jump past."
       ]
     }
   ],
@@ -2135,10 +2114,9 @@
       "id": 1,
       "name": "Kihunter Dodge",
       "note": [
-        "When coming from the Save room door, the first Kihunter can be baited by jumping into the door then walking left.",
-        "The second Kihunter can be jumped past by waiting for the right timing, if it is in the way.",
-        "Wait for the top Kihunter to exit the corridor and wait just below so that it will bonk the wall when it attempts to swoop, then jump past.",
-        "It is possible the second and third Kihunters group up in the middle which may not be possible to pass without taking damage."
+        "Stand near the door and jump up to the higher level once the first Kihunter comes on screen.",
+        "Wait near the left wall for a brief time for the middle area to be clear of Kihunters.",
+        "If the top Kihunter is above, wait for it to exit the corridor and avoid its lunge and jump past."
       ]
     },
     {