diff --git a/region/lowernorfair/east/The Worst Room In The Game.json b/region/lowernorfair/east/The Worst Room In The Game.json
index 8c189e2d8..1d18b0708 100644
--- a/region/lowernorfair/east/The Worst Room In The Game.json	
+++ b/region/lowernorfair/east/The Worst Room In The Game.json	
@@ -1821,11 +1821,30 @@
           "ScrewAttack",
           {"haveBlueSuit": {}}
         ]},
-        "h_heatedGModeOpenDifferentDoor"
+        {"or": [
+          "h_heatedGModeOpenDifferentDoor",
+          {"and": [
+            "h_heatedGModePauseAbuse",
+            "canBeLucky"
+          ]},
+          {"and": [
+            "h_heatedGModePauseAbuse",
+            "Ice",
+            "Plasma"
+          ]}
+        ]}
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
-      "blueSuitChecked": true
+      "blueSuitChecked": true,
+      "note": [
+        "To save Energy, it is possible to lure a pirate to the door and pause abuse to grab its Energy drop on G-mode exit.",
+        "This requires traversing the room quickly enough to prevent the enemies from overloading shots, or by using Ice and Plasma to freeze the Namihes on the descent."
+      ],
+      "detailNote": [
+        "Either kill the lowest pirate immediately as it lands on the left wall, which requires a large Energy drop to escape (2/3 chance),",
+        "or let it jump back to the right and hope it climbs low fast enough to be able to escape with even a small drop (50% chance, or Plasma and Ice)."
+      ]
     },
     {
       "id": 82,
diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json
index 59dacc386..853b580b1 100644
--- a/region/maridia/inner-pink/Aqueduct.json
+++ b/region/maridia/inner-pink/Aqueduct.json
@@ -189,6 +189,11 @@
       "id": "A",
       "name": "Power Bomb Blocks",
       "obstacleType": "inanimate"
+    },
+    {
+      "id": "R-Mode",
+      "name": "Entered with R-Mode",
+      "obstacleType": "abstract"
     }
   ],
   "enemies": [
@@ -236,7 +241,8 @@
       "link": [1, 1],
       "name": "Crystal Flash",
       "requires": [
-        "h_CrystalFlash"
+        "h_CrystalFlash",
+        {"obstaclesNotCleared": ["R-Mode"]}
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
@@ -261,6 +267,17 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "R-Mode Entry",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [],
+      "clearsObstacles": ["R-Mode"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 3,
       "link": [1, 1],
@@ -309,40 +326,6 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
-    {
-      "id": 187,
-      "link": [1, 2],
-      "name": "R-Mode Spark Interrupt",
-      "entranceCondition": {
-        "comeInWithRMode": {}
-      },
-      "requires": [
-        "Gravity",
-        {"or": [
-          "h_CrystalFlashForReserveEnergy",
-          {"and": [
-            "h_RModeCanRefillReserves",
-            {"enemyKill": {
-              "enemies": [["Yard"], ["Yard"], ["Yard"], ["Yard"]],
-              "explicitWeapons": ["BlueSuit", "Bombs"]
-            }},
-            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
-          ]}
-        ]},
-        "h_shinechargeMaxRunway",
-        {"autoReserveTrigger": {}},
-        "canRModeSparkInterrupt"
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": [
-        "Farm four Yards for energy, or else Crystal Flash. Free the Yard from the bottom pit, then run",
-        "across the bottom runway. Poke the Yard with a beam shot to anger it and have it interrupt the.",
-        "shinespark windup.",
-        "To kill a Yard with Speed, tap it with a beam shot to knock it down to the runway, run away from it,",
-        "then run back towards it. (Morph Bombs also work and are safer.)"
-      ]
-    },
     {
       "id": 6,
       "link": [1, 2],
@@ -380,7 +363,8 @@
           "canXRayCeilingClip",
           {"and": [
             "h_jumpIntoCrystalFlashClip",
-            "Grapple"
+            "Grapple",
+            {"obstaclesNotCleared": ["R-Mode"]}
           ]}
         ]},
         "canBeExtremelyPatient"
@@ -565,6 +549,16 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [2, 1],
+      "name": "Gravity Jump",
+      "requires": [
+        "canGravityJump"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "wallJumpAvoid": true
+    },
     {
       "id": 13,
       "link": [2, 1],
@@ -933,40 +927,6 @@
         "continuing to hold forward while jumping allows Samus to clip through without activating the spark."
       ]
     },
-    {
-      "id": 188,
-      "link": [2, 2],
-      "name": "R-Mode Spark Interrupt",
-      "entranceCondition": {
-        "comeInWithRMode": {}
-      },
-      "requires": [
-        "Gravity",
-        {"or": [
-          "h_CrystalFlashForReserveEnergy",
-          {"and": [
-            "h_RModeCanRefillReserves",
-            {"enemyKill": {
-              "enemies": [["Yard"], ["Yard"], ["Yard"], ["Yard"]],
-              "explicitWeapons": ["BlueSuit", "Bombs"]
-            }},
-            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
-          ]}
-        ]},
-        "h_shinechargeMaxRunway",
-        {"autoReserveTrigger": {}},
-        "canRModeSparkInterrupt"
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": [
-        "Farm four Yards for energy, or else Crystal Flash. Free the Yard from the bottom pit, then run",
-        "across the bottom runway. Poke the Yard with a beam shot to anger it and have it interrupt the.",
-        "shinespark windup.",
-        "To kill a Yard with Speed, tap it with a beam shot to knock it down to the runway, run away from it,",
-        "then run back towards it. (Morph Bombs also work and are safer.)"
-      ]
-    },
     {
       "id": 26,
       "link": [2, 2],
@@ -1341,7 +1301,7 @@
           {"cycleFrames": 1045}
         ]}
       ],
-      "resetsObstacles": ["A"],
+      "resetsObstacles": ["A", "R-Mode"],
       "farmCycleDrops": [{"enemy": "Yard", "count": 2}],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -1351,7 +1311,8 @@
       "link": [2, 2],
       "name": "Crystal Flash",
       "requires": [
-        "h_CrystalFlash"
+        "h_CrystalFlash",
+        {"obstaclesNotCleared": ["R-Mode"]}
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
@@ -1393,6 +1354,47 @@
         "Do not release dash in the water or Samus will not be able to get blue speed."
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "R-Mode Entry",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [],
+      "clearsObstacles": ["R-Mode"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
+    {
+      "id": 188,
+      "link": [2, 2],
+      "name": "R-Mode Spark Interrupt",
+      "requires": [
+        {"obstaclesCleared": ["R-Mode"]},
+        "Gravity",
+        {"or": [
+          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_RModeCanRefillReserves",
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
+          ]}
+        ]},
+        "h_shinechargeMaxRunway",
+        {"autoReserveTrigger": {}},
+        "canRModeSparkInterrupt"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Gain Energy with a Crystal Flash or farm Yards with Bombs or Speed Booster.",
+        "To kill one with Speed Booster, shoot it, run away then run back with blue speed.",
+        "Then use an angry Yard to interrupt a spark."
+      ],
+      "devNote": [
+        "This could also be done at 5, which could be important if Samus is not able to pause or Gravity Jump.",
+        "This will be important when doing this with a flash suit with no Gravity or Speed."
+      ]
+    },
     {
       "id": 29,
       "link": [2, 2],
@@ -1698,7 +1700,8 @@
           "canXRayCeilingClip",
           {"and": [
             "h_jumpIntoCrystalFlashClip",
-            "Grapple"
+            "Grapple",
+            {"obstaclesNotCleared": ["R-Mode"]}
           ]}
         ]}
       ],
@@ -1728,7 +1731,8 @@
           "canXRayCeilingClip",
           {"and": [
             "h_jumpIntoCrystalFlashClip",
-            "Grapple"
+            "Grapple",
+            {"obstaclesNotCleared": ["R-Mode"]}
           ]}
         ]}
       ],
@@ -1787,6 +1791,27 @@
       "blueSuitChecked": true,
       "note": "Watch out for snails coming from above, or aggressive snails from below, who will either block or attack Samus."
     },
+    {
+      "link": [2, 9],
+      "name": "Gravity Jump",
+      "requires": [
+        "canGravityJump",
+        {"or": [
+          "HiJump",
+          {"and": [
+            "canSpringBallJumpMidAir",
+            "canTrickyJump"
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "wallJumpAvoid": true,
+      "note": [
+        "Gravity Jump up to the top with HiJump.",
+        "It is possible to jump up without HiJump with a precise jump and equipping Spring Ball and Gravity at the peak of the jump."
+      ]
+    },
     {
       "id": 50,
       "link": [2, 9],
@@ -2109,40 +2134,6 @@
         "At the beginning of the climb, avoid pressing left without X-Ray being held, to prevent triggering the transition of the bottom door."
       ]
     },
-    {
-      "id": 190,
-      "link": [5, 2],
-      "name": "R-Mode Spark Interrupt",
-      "entranceCondition": {
-        "comeInWithRMode": {}
-      },
-      "requires": [
-        "Gravity",
-        {"or": [
-          "h_CrystalFlashForReserveEnergy",
-          {"and": [
-            "h_RModeCanRefillReserves",
-            {"enemyKill": {
-              "enemies": [["Yard"], ["Yard"], ["Yard"], ["Yard"]],
-              "explicitWeapons": ["BlueSuit", "Bombs"]
-            }},
-            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
-          ]}
-        ]},
-        "h_shinechargeMaxRunway",
-        {"autoReserveTrigger": {}},
-        "canRModeSparkInterrupt"
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": [
-        "Farm four Yards for energy, or else Crystal Flash. Free the Yard from the bottom pit, then run",
-        "across the bottom runway. Poke the Yard with a beam shot to anger it and have it interrupt the.",
-        "shinespark windup.",
-        "To kill a Yard with Speed, tap it with a beam shot to knock it down to the runway, run away from it,",
-        "then run back towards it. (Morph Bombs also work and are safer.)"
-      ]
-    },
     {
       "id": 67,
       "link": [5, 2],
@@ -2410,7 +2401,7 @@
           {"cycleFrames": 260}
         ]}
       ],
-      "resetsObstacles": ["A"],
+      "resetsObstacles": ["A", "R-Mode"],
       "farmCycleDrops": [{"enemy": "Yard", "count": 1}],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -2420,11 +2411,23 @@
       "link": [5, 5],
       "name": "Crystal Flash",
       "requires": [
-        "h_CrystalFlash"
+        "h_CrystalFlash",
+        {"obstaclesNotCleared": ["R-Mode"]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [5, 5],
+      "name": "R-Mode Entry",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [],
+      "clearsObstacles": ["R-Mode"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 80,
       "link": [5, 5],
@@ -2672,7 +2675,8 @@
           "canXRayCeilingClip",
           {"and": [
             "h_jumpIntoCrystalFlashClip",
-            "Grapple"
+            "Grapple",
+            {"obstaclesNotCleared": ["R-Mode"]}
           ]}
         ]}
       ],
@@ -2938,41 +2942,6 @@
       "blueSuitChecked": true,
       "devNote": "FIXME: This is doable with just Bombs and entering on the left side."
     },
-    {
-      "id": 191,
-      "link": [6, 2],
-      "name": "R-Mode Spark Interrupt",
-      "entranceCondition": {
-        "comeInWithRMode": {},
-        "comesThroughToilet": "no"
-      },
-      "requires": [
-        "Gravity",
-        {"or": [
-          "h_CrystalFlashForReserveEnergy",
-          {"and": [
-            "h_RModeCanRefillReserves",
-            {"enemyKill": {
-              "enemies": [["Yard"], ["Yard"], ["Yard"], ["Yard"]],
-              "explicitWeapons": ["BlueSuit", "Bombs"]
-            }},
-            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
-          ]}
-        ]},
-        "h_shinechargeMaxRunway",
-        {"autoReserveTrigger": {}},
-        "canRModeSparkInterrupt"
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": [
-        "Farm four Yards for energy, or else Crystal Flash. Free the Yard from the bottom pit, then run",
-        "across the bottom runway. Poke the Yard with a beam shot to anger it and have it interrupt the.",
-        "shinespark windup.",
-        "To kill a Yard with Speed, tap it with a beam shot to knock it down to the runway, run away from it,",
-        "then run back towards it. (Morph Bombs also work and are safer.)"
-      ]
-    },
     {
       "id": 100,
       "link": [6, 5],
@@ -3025,6 +2994,18 @@
         "FIXME: It's probably possible to leave in 'left' position, with an exceptionally precise swing and maybe a bit of arm pumping."
       ]
     },
+    {
+      "link": [6, 6],
+      "name": "R-Mode Entry",
+      "entranceCondition": {
+        "comeInWithRMode": {},
+        "comesThroughToilet": "no"
+      },
+      "requires": [],
+      "clearsObstacles": ["R-Mode"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 102,
       "link": [6, 6],
@@ -3151,6 +3132,38 @@
         "Use at least a small amount of momentum before jumping over towards the snail."
       ]
     },
+    {
+      "link": [6, 6],
+      "name": "R-Mode Forced Standup clip",
+      "requires": [
+        {"obstaclesCleared": ["R-Mode"]},
+        "Morph",
+        {"or": [
+          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_RModeCanRefillReserves",
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+            {"or": [
+              "h_useMorphBombs",
+              {"and": [
+                "Gravity",
+                "h_getBlueSpeedMaxRunway"
+              ]}
+            ]}
+          ]}
+        ]},
+        {"autoReserveTrigger": {}}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "bypassesDoorShell": "yes",
+      "note": [
+        "Gain Reserve Energy with a Crystal Flash or farm Yards with Bombs or Speed Booster.",
+        "Shoot a Yard with a beam shot to anger it, then Morph on top of another against the door.",
+        "Shortly after the angry one circles the room and hits Samus, jump to clip through the door.",
+        "To kill a Yard with Speed Booster, tap it with a beam shot, run away from it, then run back towards it with blue speed."
+      ]
+    },
     {
       "id": 186,
       "link": [6, 6],
@@ -3181,7 +3194,7 @@
           ]}
         ]}
       ],
-      "resetsObstacles": ["A"],
+      "resetsObstacles": ["A", "R-Mode"],
       "farmCycleDrops": [{"enemy": "Yard", "count": 2}],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -3206,7 +3219,8 @@
           "canXRayCeilingClip",
           {"and": [
             "h_jumpIntoCrystalFlashClip",
-            "Grapple"
+            "Grapple",
+            {"obstaclesNotCleared": ["R-Mode"]}
           ]}
         ]}
       ],
@@ -3542,7 +3556,8 @@
       "link": [9, 9],
       "name": "Crystal Flash",
       "requires": [
-        "h_CrystalFlash"
+        "h_CrystalFlash",
+        {"obstaclesNotCleared": ["R-Mode"]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true