diff --git a/region/norfair/east/Red Pirate Shaft.json b/region/norfair/east/Red Pirate Shaft.json
index 25fb3395c..f255705fc 100644
--- a/region/norfair/east/Red Pirate Shaft.json	
+++ b/region/norfair/east/Red Pirate Shaft.json	
@@ -195,27 +195,52 @@
     {
       "id": 5,
       "link": [1, 2],
-      "name": "Base",
+      "name": "Tank the Damage",
       "requires": [
-        {"enemyDamage": {
-          "enemy": "Red Space Pirate (standing)",
-          "type": "contact",
-          "hits": 1
-        }}
+        {"or": [
+          {"enemyDamage": {
+            "enemy": "Red Space Pirate (standing)",
+            "type": "contact",
+            "hits": 3
+          }},
+          {"and": [
+            {"enemyDamage": {
+              "enemy": "Geemer (grey)",
+              "type": "contact",
+              "hits": 3
+            }},
+            {"or": [
+              {"and": [
+                "canCarefulJump",
+                "HiJump"
+              ]},
+              "canPreciseWallJump",
+              {"and": [
+                "canDodgeWhileShooting",
+                "SpaceJump"
+              ]},
+              "canTrickySpringBallJump",
+              "canUseIFrames"
+            ]}
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
-      "note": [
-        "Wait for the pirates to step towards the wall then jump on their platform. Shoot them to momentarily prevent them from shooting lasers.",
-        "This strat assumes getting hit once. Note that the Geemers do much less damage than the Pirates"
-      ]
+      "note": ["Note that the Geemers do much less damage than the Pirates"]
     },
     {
       "id": 6,
       "link": [1, 2],
       "name": "Avoid the Enemies",
       "requires": [
-        "canCarefulJump"
+        {"or": [
+          "canTrickyJump",
+          {"and": [
+            "canDodgeWhileShooting",
+            "HiJump"
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -236,6 +261,22 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [1, 2],
+      "name": "Kill the Geemers",
+      "requires": [
+        "canUseGrapple",
+        {"or": [
+          "canWallJump",
+          "HiJump",
+          "SpaceJump",
+          "canSpringBallJumpMidAir"
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "devNote": "ScrewAttack and PowerBombs would use Kill the Pirates."
+    },
     {
       "id": 8,
       "link": [1, 2],
@@ -251,13 +292,43 @@
       "blueSuitChecked": true,
       "note": "Enter on the either side of the doorway to make it to the top."
     },
+    {
+      "link": [2, 1],
+      "name": "Avoid the Enemies",
+      "requires": [
+        "canDodgeWhileShooting"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": "Fall onto the Geemer platforms while avoiding the pirates."
+    },
     {
       "id": 9,
       "link": [2, 1],
-      "name": "Base",
-      "requires": [],
+      "name": "Tank the Damage",
+      "requires": [
+        {"enemyDamage": {"enemy": "Geemer (grey)", "type": "contact", "hits": 1}},  
+        {"or": [  
+          "canUseIFrames",  
+          {"enemyDamage": {"enemy": "Geemer (grey)", "type": "contact", "hits": 2}}  
+        ]} 
+      ],
       "flashSuitChecked": true,
-      "blueSuitChecked": true
+      "blueSuitChecked": true,
+      "note": "Land on the Geemers to avoid taking damage from the Red Space Pirates."
+    },
+    {
+      "link": [2, 1],
+      "name": "Kill the Enemies",
+      "requires": [
+        {"or": [
+          "canUseGrapple",
+          {"enemyKill": {"enemies": [["Red Space Pirate (standing)", "Red Space Pirate (standing)"], ["Red Space Pirate (standing)"]]}}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": "Carefully shoot the enemies from above."
     },
     {
       "id": 14,