diff --git a/region/crateria/central/Parlor and Alcatraz.json b/region/crateria/central/Parlor and Alcatraz.json
index daddc926ed..85d2b89195 100644
--- a/region/crateria/central/Parlor and Alcatraz.json	
+++ b/region/crateria/central/Parlor and Alcatraz.json	
@@ -1493,6 +1493,17 @@
         }
       }
     },
+    {
+      "link": [5, 5],
+      "name": "Ripper Farm",
+      "requires": [
+        "ScrewAttack",
+        {"cycleFrames": 180}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Ripper", "count": 1}
+      ]
+    },
     {
       "id": 57,
       "link": [5, 5],
@@ -2858,13 +2869,75 @@
       "name": "Geemer Farm",
       "requires": [
         "h_ZebesIsAwake",
-        {"resetRoom": {
-          "nodes": [3, 4, 6, 7]
-        }},
-        {"refill": ["Missile"]},
-        {"partialRefill": {"type": "Energy", "limit": 250}}
+        {"cycleFrames": 1860},
+        {"or": [
+          {"resetRoom": {
+            "nodes": [3, 4, 6, 7]
+          }},
+          {"and": [
+            {"resetRoom": {
+              "nodes": [1]
+            }},
+            {"cycleFrames": 420},
+            {"or": [
+              "ScrewAttack",
+              "h_useMorphBombs",
+              {"and": [
+                {"getBlueSpeed": {
+                  "usedTiles": 25,
+                  "steepUpTiles": 3,
+                  "steepDownTiles": 3,
+                  "openEnd": 1
+                }},
+                "canCarefulJump"
+              ]}
+            ]}
+          ]},
+          {"and": [
+            {"resetRoom": {
+              "nodes": [2]
+            }},
+            {"cycleFrames": 240},
+            "Morph"
+          ]},
+          {"and": [
+            "Morph",
+            {"resetRoom": {
+              "nodes": [5]
+            }},
+            {"cycleFrames": 420},
+            {"or": [
+              "h_bombThings",
+              {"and": [
+                "SpaceJump",
+                "canMidAirMorph",
+                "canCarefulJump"
+              ]},
+              {"and": [
+                {"notable": "Alcatraz Escape"},
+                "canPreciseWalljump",
+                "canConsecutiveWalljump",
+                "canWallJumpInstantMorph"
+              ]},
+              {"and": [
+                "canTrickySpringBallJump",
+                "canTrickyJump"
+              ]},
+              {"and": [
+                "HiJump",
+                "canTrickyDashJump",
+                "canMidAirMorph"
+              ]}
+            ]}
+          ]}
+        ]}
       ],
-      "devNote": "FIXME: Other nodes could be used to reset the room, with additional requirements."
+      "farmCycleDrops": [
+        {"enemy": "Geemer (blue)", "count": 11}
+      ],
+      "devNote": [
+        "A two-way farming strat could be added, e.g. if it is possible to reset the room at both the top-right and the bottom."
+      ]
     },
     {
       "id": 120,
diff --git a/region/crateria/central/Pre-Map Flyway.json b/region/crateria/central/Pre-Map Flyway.json
index 79c5a09060..3a35f1fe95 100644
--- a/region/crateria/central/Pre-Map Flyway.json	
+++ b/region/crateria/central/Pre-Map Flyway.json	
@@ -155,11 +155,36 @@
       "link": [1, 1],
       "name": "Mellow and Reo Farm",
       "requires": [
-        {"resetRoom": {
-          "nodes": [1, 2]
-        }},
-        {"partialRefill": {"type": "Energy", "limit": 160}},
-        {"partialRefill": {"type": "Missile", "limit": 8}}
+        {"or": [
+          {"resetRoom": {"nodes": [1]}},
+          {"and": [
+            {"resetRoom": {"nodes": [2]}},
+            {"cycleFrames": 60}
+          ]}
+        ]},
+        {"or": [
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 330}
+          ]},
+          {"and": [
+            "Wave",
+            {"cycleFrames": 355}
+          ]},
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 355}
+          ]},
+          {"and": [
+            "Spazer",
+            {"cycleFrames": 360}
+          ]},
+          {"cycleFrames": 390}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Reo", "count": 1},
+        {"enemy": "Mellow", "count": 3}
       ]
     },
     {
diff --git a/region/crateria/east/Crab Maze.json b/region/crateria/east/Crab Maze.json
index 625055d5ae..895bfd9937 100644
--- a/region/crateria/east/Crab Maze.json	
+++ b/region/crateria/east/Crab Maze.json	
@@ -133,22 +133,45 @@
       ]
     },
     {
-      "id": 2,
       "link": [1, 1],
-      "name": "Sciser Farm",
+      "name": "Sciser Farm (One Sciser)",
       "requires": [
         {"resetRoom": {
           "nodes": [1]
         }},
+        {"cycleFrames": 1080}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Sciser", "count": 1}
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Sciser Farm (Full Clear)",
+      "requires": [
         "Morph",
+        {"resetRoom": {
+          "nodes": [1]
+        }},
+        {"cycleFrames": 2700},
+        {"or": [
+          "Gravity",
+          {"cycleFrames": 700}
+        ]},
         {"or": [
           "Wave",
-          "Plasma",
           "Spazer",
-          "canUseGrapple"
-        ]},
-        {"partialRefill": {"type": "PowerBomb", "limit": 5}},
-        {"partialRefill": {"type": "Energy", "limit": 200}}
+          "Plasma",
+          "canUseGrapple",
+          {"and": [
+            "Ice",
+            {"cycleFrames": 560}
+          ]},
+          {"cycleFrames": 1550}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Sciser", "count": 8}
       ]
     },
     {
@@ -505,22 +528,42 @@
         {"resetRoom": {
           "nodes": [2]
         }},
+        {"cycleFrames": 270},
         {"or": [
+          "Gravity",
+          {"cycleFrames": 270}
+        ]},
+        {"or": [
+          "Grapple",
           {"and": [
-            {"partialRefill": {"type": "Energy", "limit": 240}},
-            {"partialRefill": {"type": "PowerBomb", "limit": 6}}
+            "Wave",
+            {"cycleFrames": 50}
           ]},
           {"and": [
-            {"refill": ["Energy", "PowerBomb"]},
-            {"or": [
-              "Gravity",
-              "Spazer",
-              "Wave",
-              "Plasma",
-              "canUseGrapple"
-            ]}
-          ]}
+            "Plasma",
+            {"cycleFrames": 50}
+          ]},
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 80}
+          ]},
+          {"and": [
+            "Spazer",
+             {"cycleFrames": 150}
+          ]},
+          {"and": [
+            "canPseudoScrew",
+            {"cycleFrames": 180}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 270}
+          ]},
+          {"cycleFrames": 420}
         ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Sciser", "count": 3}
       ]
     },
     {
diff --git a/region/crateria/east/Crateria Kihunter Room.json b/region/crateria/east/Crateria Kihunter Room.json
index 4860bfda4d..6ae3e9476e 100644
--- a/region/crateria/east/Crateria Kihunter Room.json	
+++ b/region/crateria/east/Crateria Kihunter Room.json	
@@ -337,33 +337,55 @@
     {
       "id": 17,
       "link": [2, 2],
-      "name": "Sciser Farm",
+      "name": "Sciser and Kihunter Farm",
       "requires": [
-        {"resetRoom": {
-          "nodes": [1, 2, 3]
-        }},
-        {"partialRefill": {"type": "Energy", "limit": 140}},
-        {"partialRefill": {"type": "PowerBomb", "limit": 4}}
-      ]
-    },
-    {
-      "id": 28,
-      "link": [2, 2],
-      "name": "Faster Sciser Farm",
-      "requires": [
-        {"resetRoom": {
-          "nodes": [1, 2, 3]
-        }},
         {"or": [
-          "Wave",
-          "Spazer",
-          "Plasma",
-          "canUseGrapple",
-          "canPseudoScrew",
-          "ScrewAttack"
+          {"and": [
+            {"resetRoom": {
+              "nodes": [1, 2]
+            }},
+            "canCameraManip"
+          ]},
+          {"resetRoom": {"nodes": [3]}}
         ]},
-        {"partialRefill": {"type": "Energy", "limit": 300}},
-        {"partialRefill": {"type": "PowerBomb", "limit": 8}}
+        {"or": [
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 720}
+          ]},
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 770}
+          ]},
+          {"and": [
+            "canPseudoScrew",
+            {"cycleFrames": 1000}
+          ]},
+          {"and": [
+            "canUseGrapple",
+            {"cycleFrames": 1020}
+          ]},
+          {"and": [
+            "Wave",
+            {"cycleFrames": 1050}
+          ]},
+          {"and": [
+            "Spazer",
+            {"cycleFrames": 1080}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 1170}
+          ]},
+          {"and": [
+            "canDodgeWhileShooting",
+            {"cycleFrames": 1440}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Sciser", "count": 2},
+        {"enemy": "Kihunter (green)", "count": 2}
       ]
     },
     {
diff --git a/region/crateria/east/East Ocean.json b/region/crateria/east/East Ocean.json
index 01b6dbb416..476c1fe31d 100644
--- a/region/crateria/east/East Ocean.json	
+++ b/region/crateria/east/East Ocean.json	
@@ -355,6 +355,63 @@
         "With very precise mid-air morphs/unmorphs, it is possible to get onto the first or second ocean platform directly without HiJump or canGravityJump, by using the runway on the right side of the room."
       ]
     },
+    {
+      "link": [1, 1],
+      "name": "Choot Farm (One Choot)",
+      "requires": [
+        "canDodgeWhileShooting",
+        {"cycleFrames": 215}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Choot", "count": 1}
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Choot Farm (Three Choots, Grapple)",
+      "requires": [
+        "canUseGrapple",
+        {"cycleFrames": 330}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Choot", "count": 3}
+      ],
+      "note": [
+        "Farm 3 Choots using Grapple to collect the drops, without dipping into the water."
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Choot Farm (Four Choots, Gravity)",
+      "requires": [
+        "Gravity",
+        {"or": [
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 410}
+          ]},
+          {"and": [
+            "canUseGrapple",
+            {"cycleFrames": 440}
+          ]},
+          {"and": [
+            "Wave",
+            {"cycleFrames": 460}
+          ]},
+          {"and": [
+            "Spazer",
+            {"cycleFrames": 540}
+          ]},
+          {"and": [
+            "canDodgeWhileShooting",
+            {"cycleFrames": 730}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Choot", "count": 4}
+      ]
+    },
     {
       "id": 7,
       "link": [1, 1],
@@ -814,6 +871,44 @@
       },
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 2],
+      "name": "Choot Farm (One Choot)",
+      "requires": [
+        "Gravity",
+        {"cycleFrames": 270},
+        {"or": [
+          "HiJump",
+          {"and": [
+            "canWalljump",
+            {"cycleFrames": 45}
+          ]}
+        ]},
+        {"or": [
+          "Plasma",
+          {"and": [
+            "canUseGrapple",
+            {"cycleFrames": 15}
+          ]},
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 15}
+          ]},
+          {"and": [            
+            "Wave",
+            {"cycleFrames": 35}
+          ]},
+          {"and": [            
+            "Spazer",
+            {"cycleFrames": 55}
+          ]},
+          {"cycleFrames": 105}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Choot", "count": 1}
+      ]
+    },
     {
       "id": 24,
       "link": [2, 2],
diff --git a/region/crateria/east/Forgotten Highway Kago Room.json b/region/crateria/east/Forgotten Highway Kago Room.json
index 2607f0be36..04b6837723 100644
--- a/region/crateria/east/Forgotten Highway Kago Room.json	
+++ b/region/crateria/east/Forgotten Highway Kago Room.json	
@@ -89,24 +89,19 @@
       "link": [1, 1],
       "name": "Kago Farm",
       "requires": [
-        {"resetRoom": {
-          "nodes": [1, 2]
-        }},
-        {"partialRefill": {"type": "Super", "limit": 8}},
-        {"partialRefill": {"type": "PowerBomb", "limit": 8}},
-        {"refill": ["Energy", "Missile"]}
-      ]
-    },
-    {
-      "id": 2,
-      "link": [1, 1],
-      "name": "Kago Full Farm",
-      "requires": [
-        {"resetRoom": {
-          "nodes": [1, 2]
-        }},
-        "canBePatient",
-        {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
+        {"or": [
+          {"and": [
+            {"resetRoom": {"nodes": [1]}},
+            {"cycleFrames": 1230}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [2]}},
+            {"cycleFrames": 1710}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Kago", "count": 2}
       ]
     },
     {
diff --git a/region/crateria/east/Homing Geemer Room.json b/region/crateria/east/Homing Geemer Room.json
index e8ccae6e1a..7ebe5d1ea4 100644
--- a/region/crateria/east/Homing Geemer Room.json	
+++ b/region/crateria/east/Homing Geemer Room.json	
@@ -80,6 +80,21 @@
       },
       "unlocksDoors": [{"nodeId": 2, "types": ["ammo"], "requires": []}]
     },
+    {
+      "link": [1, 1],
+      "name": "Homing Geemer Farm",
+      "requires": [
+        "canUseGrapple",
+        "canTrickyJump",
+        {"cycleFrames": 150}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Geemer (orange)", "count": 1}
+      ],
+      "note": [
+        "Jump, aim up, and fire Grapple mid-air to clip the beam through the ceiling."
+      ]
+    },
     {
       "id": 3,
       "link": [1, 1],
diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json
index 56edf7d0eb..4a23644f00 100644
--- a/region/crateria/east/West Ocean.json	
+++ b/region/crateria/east/West Ocean.json	
@@ -2093,7 +2093,10 @@
       "link": [6, 6],
       "name": "Zeb Farm",
       "requires": [
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"cycleFrames": 105}        
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Zeb", "count": 1}
       ]
     },
     {
@@ -2861,12 +2864,132 @@
       "link": [13, 13],
       "name": "Ripper2 Farm",
       "requires": [
-        {"resetRoom": {
-          "nodes": [1, 4, 5]
-        }},
         "ScrewAttack",
-        {"partialRefill": {"type": "Super", "limit": 4}},
-        {"partialRefill": {"type": "Energy", "limit": 80}}
+        "canCarefulJump",
+        {"or": [
+          {"and": [
+            {"resetRoom": {
+              "nodes": [1]
+            }},
+            {"cycleFrames": 1000}
+          ]},
+          {"and": [
+            {"resetRoom": {
+              "nodes": [4]
+            }},
+            {"or": [
+              {"and": [
+                "canWalljump",
+                {"cycleFrames": 380}  
+              ]},
+              {"and": [
+                "SpaceJump",
+                {"cycleFrames": 320}
+              ]}
+            ]}
+          ]},
+          {"and": [
+            {"resetRoom": {
+              "nodes": [5]
+            }},
+            {"cycleFrames": 480}
+          ]}
+        ]}
+      ],
+      "resetsObstacles": ["A", "B"],
+      "farmCycleDrops": [
+        {"enemy": "Ripper 2 (green)", "count": 1}
+      ]
+    },
+    {
+      "link": [13, 13],
+      "name": "Skultera Farm",
+      "requires": [
+        {"or": [
+          {"and": [
+            {"resetRoom": {"nodes": [1]}},
+            {"or": [
+              {"and": [
+                "Gravity",
+                {"cycleFrames": 790}    
+              ]},
+              {"cycleFrames": 1380}
+            ]}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [4]}},
+            {"or": [
+              {"and": [
+                "Gravity",
+                "SpaceJump",
+                {"cycleFrames": 750}
+              ]},
+              {"and": [
+                "Gravity",
+                "canWalljump",
+                {"cycleFrames": 1020}
+              ]},
+              {"and": [
+                "SpaceJump",
+                {"cycleFrames": 1390}
+              ]},
+              {"and": [
+                "canWalljump",
+                {"cycleFrames": 1420}
+              ]}
+            ]}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [5]}},
+            {"or": [
+              {"and": [
+                "Gravity",
+                "SpaceJump",
+                {"cycleFrames": 690}
+              ]},
+              {"and": [
+                "Gravity",
+                "canWalljump",
+                {"cycleFrames": 820}
+              ]},
+              {"and": [
+                "Gravity",
+                {"cycleFrames": 1110}
+              ]},
+              {"cycleFrames": 1600}
+            ]}
+          ]}
+        ]},
+        {"or": [
+          {"and": [
+            "ScrewAttack",
+            "Gravity"
+          ]},
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 50}
+          ]},
+          {"and": [
+            "Wave",
+            {"cycleFrames": 160}
+          ]},
+          {"and": [
+            "Spazer",
+            {"cycleFrames": 200}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 290}
+          ]},
+          {"and": [
+            "canPseudoScrew",
+            {"cycleFrames": 290}
+          ]},
+          {"cycleFrames": 500}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Skultera", "count": 2}
       ],
       "resetsObstacles": ["A", "B"]
     },
diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json
index 8e82dfa0ed..bc73ff6af5 100644
--- a/region/crateria/west/Gauntlet Energy Tank Room.json	
+++ b/region/crateria/west/Gauntlet Energy Tank Room.json	
@@ -214,7 +214,10 @@
       "link": [1, 1],
       "name": "Zebbo Farm",
       "requires": [
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"cycleFrames": 140}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Zebbo", "count": 1}
       ]
     },
     {
diff --git a/region/crateria/west/Gauntlet Entrance.json b/region/crateria/west/Gauntlet Entrance.json
index 50fd7548bf..81ce32a1a4 100644
--- a/region/crateria/west/Gauntlet Entrance.json	
+++ b/region/crateria/west/Gauntlet Entrance.json	
@@ -80,6 +80,33 @@
     }
   ],
   "strats": [
+    {
+      "link": [1, 1],
+      "name": "Waver Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [1]}},
+        {"or": [
+          {"and": [
+            "ScrewAttack",
+            "canDodgeWhileShooting",
+            {"cycleFrames": 600}
+          ]},
+          {"and": [
+            "h_bombThings",
+            "canTrickyDodgeEnemies",
+            {"cycleFrames": 850}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Waver", "count": 2}
+      ],
+      "resetsObstacles": ["A"],
+      "devNote": [
+        "There is a third Waver on the right side of the room,",
+        "but generally it would not be worthwhile to cross the room for it."
+      ]
+    },
     {
       "id": 1,
       "link": [1, 1],
@@ -843,6 +870,29 @@
         "Get it to move to the right in order to safely Power Bomb the final set of walls. Follow the Waver around the room a few times in order to get it to the left doorway."
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "Waver Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [2]}},
+        "canDodgeWhileShooting",
+        {"or": [
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 420}
+          ]},
+          {"and": [
+            "h_bombThings",
+            "canTrickyDodgeEnemies",
+             {"cycleFrames": 630}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Waver", "count": 1}
+      ],
+      "resetsObstacles": ["A"]
+    },
     {
       "id": 38,
       "link": [2, 2],
diff --git a/region/crateria/west/Green Pirates Shaft.json b/region/crateria/west/Green Pirates Shaft.json
index 58e4644efd..1c3dd2588f 100644
--- a/region/crateria/west/Green Pirates Shaft.json	
+++ b/region/crateria/west/Green Pirates Shaft.json	
@@ -185,6 +185,13 @@
       "quantity": 5,
       "homeNodes": [2, 4],
       "note": "They're really between 2 and 4, but they are the actual obstacle between the two, so access to either + ability to kill them is enough to get their drops."
+    },
+    {
+      "id": "e2",
+      "groupName": "Green Pirates Beetoms",
+      "enemyName": "Beetom",
+      "quantity": 2,
+      "homeNodes": [9]
     }
   ],
   "links": [
@@ -382,27 +389,44 @@
     {
       "id": 9,
       "link": [2, 2],
-      "name": "Green Pirate Farm",
+      "name": "Pirate Farm",
       "requires": [
-        {"resetRoom": {
-          "nodes": [2, 3, 4]
-        }},
+        {"and": [
+          {"resetRoom": {"nodes": [2, 3, 4]}},
+          {"cycleFrames": 850}
+        ]},
         {"or": [
-          "Ice",
+          "ScrewAttack",
           "Wave",
           "Spazer",
-          "Plasma"
-        ]},
-        {"partialRefill": {"type": "Energy", "limit": 400}},
-        {"partialRefill": {"type": "Missile", "limit": 20}}
+          "Plasma",
+          {"and": [
+            "canPseudoScrew",
+            {"cycleFrames": 230}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 240}
+          ]},
+          {"and": [
+            "Charge",
+            "canDodgeWhileShooting",
+            {"cycleFrames": 500}
+          ]}
+        ]}
       ],
-      "resetsObstacles": ["A"]
+      "farmCycleDrops": [
+        {"enemy": "Green Space Pirate (standing)", "count": 5}
+      ],
+      "resetsObstacles": ["A"],
+      "devNote": ["A two-way farm strat could be added for if the room can be reset at both the top and bottom."]
     },
     {
       "id": 77,
       "link": [2, 2],
       "name": "Beetom Farm",
       "requires": [
+        {"cycleFrames": 650},
         {"resetRoom": {
           "nodes": [2]
         }},
@@ -410,11 +434,62 @@
         {"or": [
           "canMidAirMorph",
           "h_useSpringBall"
-        ]},
-        {"partialRefill": {"type": "PowerBomb", "limit": 6}}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Beetom", "count": 2},
+        {"enemy": "Green Space Pirate (standing)", "count": 2}
       ],
       "clearsObstacles": ["A"],
-      "devNote": "Killing the beetoms will also clear the top pirate for small health gain."
+      "note": [
+        "Jump to lay a Power Bomb above ground height, to both break the Power Bomb blocks and kill the Beetoms.",
+        "The top two Space Pirates will also be killed."
+      ]
+    },
+    {
+      "link": [2, 2],
+      "name": "Pirates and Beetom Farm",
+      "requires": [
+        {"or": [
+          {"and": [
+            {"resetRoom": {"nodes": [2]}},
+            {"cycleFrames": 1150}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [3, 4]}},
+            {"cycleFrames": 1400}
+          ]}
+        ]},
+        {"or": [
+          "ScrewAttack",
+          "Wave",
+          "Spazer",
+          "Plasma",
+          {"and": [
+            "Charge",
+            "canDodgeWhileShooting",
+            {"cycleFrames": 500}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 240}
+          ]}
+        ]},
+        "h_usePowerBomb",
+        {"or": [
+          "canMidAirMorph",
+          "h_useSpringBall"
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Green Space Pirate (standing)", "count": 5},
+        {"enemy": "Beetom", "count": 2}
+      ],
+      "resetsObstacles": ["A"],
+      "devNote": [
+        "This strat mainly exists as a way to farm Beetoms in case the room cannot be reset at node 2;",
+        "in this case, the Pirate along the way comes almost for free, and it also works at node 2."
+      ]
     },
     {
       "id": 10,
diff --git a/region/crateria/west/Lower Mushrooms.json b/region/crateria/west/Lower Mushrooms.json
index 5116717cf1..c611012d53 100644
--- a/region/crateria/west/Lower Mushrooms.json	
+++ b/region/crateria/west/Lower Mushrooms.json	
@@ -88,21 +88,10 @@
         {"resetRoom": {
           "nodes": [1, 2]
         }},
-        {"partialRefill": {"type": "Super", "limit": 8}},
-        {"partialRefill": {"type": "PowerBomb", "limit": 8}},
-        {"refill": ["Energy", "Missile"]}
-      ]
-    },
-    {
-      "id": 16,
-      "link": [1, 1],
-      "name": "Kago Full Farm",
-      "requires": [
-        {"resetRoom": {
-          "nodes": [1, 2]
-        }},
-        "canBePatient",
-        {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
+        {"cycleFrames": 1200}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Kago", "count": 2}
       ]
     },
     {
diff --git a/region/crateria/west/Terminator Room.json b/region/crateria/west/Terminator Room.json
index 3cda49660e..8314fccb57 100644
--- a/region/crateria/west/Terminator Room.json	
+++ b/region/crateria/west/Terminator Room.json	
@@ -127,11 +127,32 @@
       "link": [1, 1],
       "name": "Geemer and Waver Farm",
       "requires": [
-        {"resetRoom": {
-          "nodes": [1, 2]
-        }},
-        {"refill": ["Energy", "Missile"]},
-        {"partialRefill": {"type": "Super", "limit": 10}}
+        {"or": [
+          {"resetRoom": {
+            "nodes": [1]
+          }},
+          {"and": [
+            {"resetRoom": {
+              "nodes": [2]
+            }},
+            {"cycleFrames": 60}              
+          ]}
+        ]},
+        {"or": [
+          {"and": [
+            {"or": [
+              "Wave",
+              "Spazer",
+              "Plasma"
+            ]},
+            {"cycleFrames": 960}
+          ]},
+          {"cycleFrames": 1110}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Geemer (blue)", "count": 6},
+        {"enemy": "Waver", "count": 3}
       ]
     },
     {