diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index 26c1e12299..8d90cff0e5 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -165,7 +165,7 @@
         {"id": 1},
         {"id": 3},
         {"id": 5},
-        {"id": 6}
+        {"id": 7}
       ]
     },
     {
@@ -175,7 +175,7 @@
         {"id": 2},
         {"id": 3},
         {"id": 5},
-        {"id": 6}
+        {"id": 7}
       ]
     },
     {
@@ -184,6 +184,7 @@
         {"id": 1},
         {"id": 2},
         {"id": 3},
+        {"id": 5},
         {"id": 4},
         {"id": 6}
       ]
@@ -195,6 +196,7 @@
         {"id": 2},
         {"id": 3},
         {"id": 4},
+        {"id": 5},
         {"id": 7}
       ]
     },
@@ -361,7 +363,7 @@
     },
     {
       "id": 9,
-      "link": [1, 6],
+      "link": [1, 7],
       "name": "G-Mode Morph Blind Movement Through Crumbles and Spikeway",
       "entranceCondition": {
         "comeInWithGMode": {
@@ -374,22 +376,70 @@
         {"or": [
           "h_artificialMorphBombs",
           "h_artificialMorphSpringBall",
-          {"ammo": {"type": "PowerBomb", "count": 6}}
+          {"ammo": {"type": "PowerBomb", "count": 2}}
+        ]},
+        {"or": [
+          "h_artificialMorphPowerBomb",
+          "ScrewAttack",
+          "canTrickyGMode",
+          {"and": [
+            "canInsaneJump",
+            {"or": [
+              "Ice",
+              {"ammo": {"type": "Missile", "count": 1}},
+              {"ammo": {"type": "Super", "count": 1}}
+            ]}
+          ]},
+          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}
         ]}
       ],
       "clearsObstacles": ["B"],
       "flashSuitChecked": true,
       "note": [
         "Fall into the pit while being careful to only touch one of the crumble blocks.",
-        "Bounce up through the camera scroll blocks to overload PLMs with Spring Ball, Bombs, or 6 Power Bombs.",
+        "Bounce up through the camera scroll blocks to overload PLMs with Spring Ball, Bombs, or Power Bombs.",
+        "This can be done with as few as 2 Power Bombs by placing the bomb, moving slightly, then as it boosts Samus horizontally,",
+        "hold backwards to avoid landing on another crumble block. Otherwise it takes 6 Power Bombs.",
         "Move horizontally to fall through the crumble blocks that haven't been touched.",
         "Carefully fall to not touch the spikes on the right, then roll through the spikeway.",
         "After the camera stops scrolling, move another 2-3 tiles then exit G-Mode.",
-        "Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus."
+        "Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus, or precisely jump underneath it."
       ],
-      "devNote": [
-        "This can easily be done with fewer Power Bombs by moving horizontally through the camera scroll blocks while midair,",
-        "but the blind movement would be more annoying while risking accidentally touching the other crumble blocks."
+      "devNote": "FIXME: With only 2 Power Bombs, this would force the item pickup in direct G-mode."
+    },
+    {
+      "link": [1, 7],
+      "name": "Direct G-Mode Morph Blind Movement, Overload PLMs with Item",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"itemNotCollectedAtNode": 5},
+        "canRiskPermanentLossOfAccess",
+        "canOffScreenMovement",
+        "canInsaneJump",
+        {"or": [
+          "canTrickyGMode",
+          "h_artificialMorphPowerBomb",
+          "ScrewAttack",
+          "Ice",
+          {"ammo": {"type": "Missile", "count": 1}},
+          {"ammo": {"type": "Super", "count": 1}},
+          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}
+        ]}
+      ],
+      "clearsObstacles": ["B"],
+      "collectsItems": [5],
+      "flashSuitChecked": true,
+      "note": [
+        "Roll through the item to mostly overload PLMs before falling into the pit and fully overloading them with the camera scroll blocks.",
+        "Fully overloading the PLMs before touching the camera scroll blocks will prevent the camera from following Samus after exiting G-mode.",
+        "While falling, carefully avoid touching the thorns on the right, then roll through the spikeway.",
+        "After the camera stops scrolling, move another 2-3 tiles then exit G-Mode.",
+        "Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus, or precisely jump underneath it."
       ]
     },
     {
@@ -688,7 +738,7 @@
     },
     {
       "id": 25,
-      "link": [2, 6],
+      "link": [2, 7],
       "name": "G-Mode Morph Blind Movement Through Crumbles and Spikeway",
       "entranceCondition": {
         "comeInWithGMode": {
@@ -701,24 +751,73 @@
         {"or": [
           "h_artificialMorphBombs",
           "h_artificialMorphSpringBall",
-          {"ammo": {"type": "PowerBomb", "count": 6}}
+          {"ammo": {"type": "PowerBomb", "count": 2}}
+        ]},
+        {"or": [
+          "h_artificialMorphPowerBomb",
+          "ScrewAttack",
+          "canTrickyGMode",
+          {"and": [
+            "canInsaneJump",
+            {"or": [
+              "Ice",
+              {"ammo": {"type": "Missile", "count": 1}},
+              {"ammo": {"type": "Super", "count": 1}}
+            ]}
+          ]},
+          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}
         ]}
       ],
       "clearsObstacles": ["B"],
       "flashSuitChecked": true,
       "note": [
         "Fall into the pit while being careful to only touch one of the crumble blocks.",
-        "Bounce up through the camera scroll blocks to overload PLMs with Spring Ball, Bombs, or 6 Power Bombs.",
+        "Bounce up through the camera scroll blocks to overload PLMs with Spring Ball, Bombs, or Power Bombs.",
+        "This can be done with as few as 2 Power Bombs by placing the bomb, moving slightly, then as it boosts Samus horizontally,",
+        "hold backwards to avoid landing on another crumble block. Otherwise it takes 6 Power Bombs.",
         "Move horizontally to fall through the crumble blocks that haven't been touched.",
         "Carefully fall to not touch the spikes on the right, then roll through the spikeway.",
         "After the camera stops scrolling, move another 2-3 tiles then exit G-Mode.",
-        "Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus."
-      ],
-      "devNote": [
-        "This can easily be done with fewer Power Bombs by moving horizontally through the camera scroll blocks while midair,",
-        "but the blind movement would be more annoying while risking accidentally touching the other crumble blocks."
+        "Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus, or precisely jump underneath it."
       ]
     },
+    {
+      "link": [2, 7],
+      "name": "Direct G-Mode Morph Blind Movement, Overload PLMs with Item",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"itemNotCollectedAtNode": 5},
+        "canRiskPermanentLossOfAccess",
+        "canOffScreenMovement",
+        "h_artificialMorphPowerBomb",
+        "canInsaneJump",
+        {"or": [
+          "canTrickyGMode",
+          "h_artificialMorphPowerBomb",
+          "ScrewAttack",
+          "Ice",
+          {"ammo": {"type": "Missile", "count": 1}},
+          {"ammo": {"type": "Super", "count": 1}},
+          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}
+        ]}
+      ],
+      "clearsObstacles": ["B"],
+      "collectsItems": [5],
+      "flashSuitChecked": true,
+      "note": [
+        "Carefully Bomb boost across the pit and roll through the item to mostly overload PLMs before falling into the pit and fully overloading them with the camera scroll blocks.",
+        "Fully overloading the PLMs before touching the camera scroll blocks will prevent the camera from following Samus after exiting G-mode.",
+        "While falling, carefully avoid touching the thorns on the right, then roll through the spikeway.",
+        "After the camera stops scrolling, move another 2-3 tiles then exit G-Mode.",
+        "Make small jumps to reset the camera then quickly kill the Beetom as it jumps at Samus, or precisely jump underneath it."
+      ],
+      "devNote": "With more movement items, Samus can use the camera scroll blocks above the crumble blocks to overload PLMs."
+    },
     {
       "id": 26,
       "link": [3, 1],
@@ -883,6 +982,40 @@
       "note": "Carefully lure the Beetom below the platform, then lure a Zebbo to the left door. Be careful not to let the Zebbo go off camera, or it will despawn.",
       "devNote": "It is possible to do this with a Beetom, avoiding the tricky jump, but we will ignore that here."
     },
+    {
+      "link": [3, 3],
+      "name": "Direct G-Mode Morph, Power Bomb the Item, Collect Item and Return",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"itemNotCollectedAtNode": 5},
+        {"or": [
+          "Morph",
+          "h_artificialMorphSpringBall"
+        ]},
+        {"ammo": { "type": "PowerBomb", "count": 2}},
+        {"or": [
+          "canWalljump",
+          "SpaceJump",
+          {"and": [
+            "HiJump",
+            "canSpringBallJumpMidAir"
+          ]}
+        ]}
+      ],
+      "collectsItems": [5],
+      "flashSuitChecked": true,
+      "note": [
+        "Place two precisely positioned Power Bombs to overload PLMs. This is at the same height as the tile above the door.",
+        "This ends up being the max height Samus can jump and place it while at the very bottom of the room, with a midair morph or artificially morphed Spring Ball jump.",
+        "Because PLMs are overloaded, Samus needs to exit G-mode at the item to collect it before returning through the crumble blocks."
+      ],
+      "devNote": "This does not require canRiskPermanentLossOfAccess if Samus returns through the crumble blocks."
+    },
     {
       "id": 75,
       "link": [3, 4],
@@ -932,6 +1065,39 @@
       ],
       "devNote": ["FIXME: It's possible to farm some drops along the way."]
     },
+    {
+      "link": [3, 5],
+      "name": "Direct G-Mode Morph, Power Bomb the Item",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"itemNotCollectedAtNode": 5},
+        "canRiskPermanentLossOfAccess",
+        {"or": [
+          "Morph",
+          "h_artificialMorphSpringBall"
+        ]},
+        {"ammo": { "type": "PowerBomb", "count": 2}},
+        {"or": [
+          "canWalljump",
+          "SpaceJump",
+          {"and": [
+            "HiJump",
+            "canSpringBallJumpMidAir"
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Place two precisely positioned Power Bombs to overload PLMs. This is at the same height as the tile above the door.",
+        "This ends up being the max height Samus can jump and place it while at the very bottom of the room, with a midair morph or artificially morphed Spring Ball jump."
+      ],
+      "devNote": "This requires canRiskPermanentLossOfAccess unless Samus returns through the crumble blocks."
+    },
     {
       "id": 33,
       "link": [3, 6],
@@ -1206,6 +1372,97 @@
       "bypassesDoorShell": true,
       "flashSuitChecked": true
     },
+    {
+      "link": [4, 3],
+      "name": "G-Mode Morph Through Spikeway",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"or": [
+          {"and": [
+            {"tech": "canBombHorizontally"},
+            {"ammo": { "type": "PowerBomb", "count": 6}},
+            {"or": [
+              "canInsaneJump",
+              {"ammo": { "type": "PowerBomb", "count": 2}}
+            ]}
+          ]},
+          {"and": [
+            "h_artificialMorphSpringBall",
+            {"ammo": { "type": "PowerBomb", "count": 3}},
+            {"or": [
+              "canInsaneJump",
+              {"ammo": { "type": "PowerBomb", "count": 1}}
+            ]}
+          ]},
+          {"and": [
+            "h_artificialMorphBombs",
+            "canTrickyGMode"
+          ]}
+        ]}
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "devNote": "G-mode isnt helpful here with real Morph."
+    },
+    {
+      "link": [4, 3],
+      "name": "Direct G-Mode Morph Through Spikeway, Power Bomb the Item, Collect Item and Return",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"itemNotCollectedAtNode": 5},
+        {"or": [
+          "Morph",
+          "h_artificialMorphSpringBall"
+        ]},
+        {"or": [
+          {"and": [
+            {"ammo": { "type": "PowerBomb", "count": 3}},
+            {"or": [
+              "canInsaneJump",
+              {"ammo": { "type": "PowerBomb", "count": 1}}
+            ]}
+          ]},
+          {"and": [
+            "Morph",
+            {"or": [
+              "ScrewAttack",
+              "Ice",
+              {"ammo": {"type": "Missile", "count": 5}},
+              {"ammo": {"type": "Super", "count": 5}}
+            ]}
+          ]}
+        ]},
+        {"ammo": { "type": "PowerBomb", "count": 2}},
+        {"or": [
+          "canWalljump",
+          "SpaceJump",
+          {"and": [
+            "HiJump",
+            "canSpringBallJumpMidAir"
+          ]}
+        ]}
+      ],
+      "clearsObstacles": ["A"],
+      "collectsItems": [5],
+      "flashSuitChecked": true,
+      "note": [
+        "Cross the room while killing the Beetoms, then use two precisely positioned Power Bombs to overload PLMs.",
+        "Place the Power Bombs at the same height as the tile above the door.",
+        "This ends up being the max height Samus can jump and place it while at the very bottom of the room, with a midair morph or artificially morphed Spring Ball jump.",
+        "Because PLMs are overloaded, Samus needs to exit G-mode at the item to collect it before returning through the crumble blocks."
+      ],
+      "devNote": "This does not require canRiskPermanentLossOfAccess if Samus returns through the crumble blocks."
+    },
     {
       "id": 48,
       "link": [4, 4],
@@ -1304,6 +1561,109 @@
       "note": "Kill or get the Beetom stuck below the platform, then lure a Zebbo to the left door. Be careful not to let the Zebbo go off camera or it will despawn.",
       "devNote": "It is possible to do this with a Beetom, avoiding the tricky jump, but we will ignore that here."
     },
+    {
+      "link": [4, 5],
+      "name": "G-Mode Morph Through Spikeway, Bomb the Crumble Blocks",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_artificialMorphIBJ",
+        {"or": [
+          "canTrickyGMode",
+          {"and": [
+            {"ammo": { "type": "PowerBomb", "count": 3}},
+            {"or": [
+              "canInsaneJump",
+              {"ammo": { "type": "PowerBomb", "count": 1}}
+            ]}
+          ]},
+          {"and": [
+            "Morph",
+            {"or": [
+              "ScrewAttack",
+              "Ice",
+              {"ammo": {"type": "Missile", "count": 5}},
+              {"ammo": {"type": "Super", "count": 5}}
+            ]}
+          ]}
+        ]},
+        {"or": [
+          "canBeVeryPatient",
+          "h_artificialMorphCeilingBombJump",
+          {"and": [
+            "canBePatient",
+            "h_artificialMorphSpringBall",
+            "HiJump"
+          ]},
+          {"and": [
+            "canBePatient",
+            "Morph",
+            {"or": [
+              "HiJump",
+              "canWalljump"
+            ]}
+          ]}
+        ]}
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "note": "Cross the room while killing the Beetoms, then bomb the bottom of the crumble blocks to overload PLMs and go through."
+    },
+    {
+      "link": [4, 5],
+      "name": "Direct G-Mode Morph Through Spikeway, Power Bomb the Item",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"itemNotCollectedAtNode": 5},
+        "canRiskPermanentLossOfAccess",
+        "h_artificialMorphMovement",
+        {"or": [
+          {"and": [
+            {"ammo": { "type": "PowerBomb", "count": 3}},
+            {"or": [
+              "canInsaneJump",
+              {"ammo": { "type": "PowerBomb", "count": 1}}
+            ]}
+          ]},
+          {"and": [
+            "Morph",
+            {"or": [
+              "ScrewAttack",
+              "Ice",
+              {"ammo": {"type": "Missile", "count": 5}},
+              {"ammo": {"type": "Super", "count": 5}}
+            ]}
+          ]}
+        ]},
+        {"ammo": { "type": "PowerBomb", "count": 2}},
+        {"or": [
+          "canWalljump",
+          "SpaceJump",
+          {"and": [
+            "HiJump",
+            "canSpringBallJumpMidAir"
+          ]},
+          "h_artificialMorphIBJ"
+        ]}
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "note": [
+        "Cross the room while killing the Beetoms, then use two precisely positioned Power Bombs to overload PLMs.",
+        "Place the Power Bombs at the same height as the tile above the door.",
+        "This ends up being the max height Samus can jump and place it while at the very bottom of the room, with a midair morph or artificially morphed Spring Ball jump."
+      ],
+      "devNote": "This requires canRiskPermanentLossOfAccess unless Samus returns through the crumble blocks."
+    },
     {
       "id": 53,
       "link": [4, 7],