diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json
index 2211343def..a5680b78cc 100644
--- a/region/maridia/inner-pink/Aqueduct.json
+++ b/region/maridia/inner-pink/Aqueduct.json
@@ -1304,6 +1304,24 @@
         "but not by enough to remove the need for the canLongChainTemporaryBlue requirement."
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "Yard Farm (2 Yards)",
+      "requires": [
+        {"resetRoom": {"nodes": [2]}},
+        "h_useMorphBombs",
+        "canDodgeWhileShooting",
+        {"or": [
+          {"and": [
+            "Gravity",
+            {"cycleFrames": 430}
+          ]},
+          {"cycleFrames": 1045}
+        ]}
+      ],
+      "resetsObstacles": ["A"],
+      "farmCycleDrops": [{"enemy": "Yard", "count": 2}]
+    },
     {
       "id": 28,
       "link": [2, 2],
@@ -2136,6 +2154,24 @@
         }
       }
     },
+    {
+      "link": [5, 5],
+      "name": "Yard Farm (1 Yard)",
+      "requires": [
+        {"resetRoom": {"nodes": [5]}},
+        "h_useMorphBombs",
+        "canDodgeWhileShooting",
+        {"or": [
+          {"and": [
+            "Gravity",
+            {"cycleFrames": 220}
+          ]},
+          {"cycleFrames": 260}
+        ]}
+      ],
+      "resetsObstacles": ["A"],
+      "farmCycleDrops": [{"enemy": "Yard", "count": 1}]
+    },
     {
       "id": 79,
       "link": [5, 5],
@@ -2772,6 +2808,35 @@
         "Use at least a small amount of momentum before jumping over towards the snail."
       ]
     },
+    {
+      "link": [6, 6],
+      "name": "Yard Farm (2 Yards)",
+      "requires": [
+        {"resetRoom": {"nodes": [6]}},
+        "h_useMorphBombs",
+        "canDodgeWhileShooting",
+        {"or": [
+          {"and": [
+            "Gravity",
+            {"cycleFrames": 2805}
+          ]},
+          {"and": [
+            "HiJump",
+            {"cycleFrames": 2870}
+          ]},
+          {"and": [
+            "canCrouchJump",
+            {"or": [
+              "canTrickyJump",
+              "canMorphTurnaround"
+            ]},
+            {"cycleFrames": 3405}
+          ]}
+        ]}
+      ],
+      "resetsObstacles": ["A"],
+      "farmCycleDrops": [{"enemy": "Yard", "count": 2}]
+    },
     {
       "id": 107,
       "link": [6, 7],
diff --git a/region/maridia/inner-pink/Below Botwoon Energy Tank.json b/region/maridia/inner-pink/Below Botwoon Energy Tank.json
index a5f363af88..ed662e1988 100644
--- a/region/maridia/inner-pink/Below Botwoon Energy Tank.json	
+++ b/region/maridia/inner-pink/Below Botwoon Energy Tank.json	
@@ -149,8 +149,28 @@
       "link": [1, 1],
       "name": "Zoa Farm",
       "requires": [
-        {"refill": ["Energy", "Missile", "Super"]}
-      ]
+        "h_navigateUnderwater",        
+        {"or": [
+          {"and": [
+            {"or": [
+              "Gravity",
+              "Grapple",
+              "canPlayInSand"
+            ]},
+            {"simpleCycleFrames": 85},
+            {"cycleFrames": 30}
+          ]},
+          {"cycleFrames": 200}
+        ]},
+        {"or": [
+          "Wave",
+          "Spazer",
+          "Plasma",
+          "Grapple",
+          {"cycleFrames": 25}
+        ]}
+      ],
+      "farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
     },
     {
       "id": 4,
diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json
index 744aed1cfc..8d510237f2 100644
--- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json	
+++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json	
@@ -248,20 +248,48 @@
       "requires": [
         {"resetRoom": {"nodes": [1]}},
         {"or": [
-          "Spazer",
-          "Wave",
-          "Plasma",
-          "canUseGrapple",
+          "Gravity",
+          {"cycleFrames": 250}
+        ]},
+        {"or": [
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 360}
+          ]},
           {"and": [
             "Gravity",
-            "ScrewAttack"
+            "ScrewAttack",
+            {"cycleFrames": 375}
+          ]},
+          {"and": [
+            "Wave",
+            {"cycleFrames": 390}
+          ]},
+          {"and": [
+            "Grapple",
+            {"cycleFrames": 400}
+          ]},
+          {"and": [
+            "Spazer",
+            {"cycleFrames": 415}
+          ]},
+          {"and": [
+            "Gravity",
+            "canPseudoScrew",
+            {"cycleFrames": 540}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 580}
+          ]},
+          {"and": [
+            "canDodgeWhileShooting",
+            {"cycleFrames": 810}
           ]}
-        ]},
-        {"partialRefill": {"type": "Energy", "limit": 200}},
-        {"partialRefill": {"type": "Missile", "limit": 12}},
-        {"partialRefill": {"type": "PowerBomb", "limit": 6}}
+        ]}
       ],
-      "resetsObstacles": ["A", "B"]
+      "resetsObstacles": ["A", "B"],
+      "farmCycleDrops": [{"enemy": "Puyo", "count": 4}]
     },
     {
       "id": 3,
@@ -1944,8 +1972,47 @@
       "link": [4, 4],
       "name": "Zoa Farm",
       "requires": [
-        {"refill": ["Energy", "Missile", "Super"]}
-      ]
+        {"or": [
+          {"and": [
+            "Gravity",
+            {"or": [
+              {"and": [
+                "Grapple",
+                {"simpleCycleFrames": 105},
+                {"cycleFrames": 20}
+              ]},    
+              {"and": [
+                {"or": [
+                  "Plasma",
+                  "Wave",
+                  "Spazer"
+                ]},
+                {"simpleCycleFrames": 115},
+                {"cycleFrames": 20}    
+              ]},
+              {"and": [
+                {"simpleCycleFrames": 115},
+                {"cycleFrames": 30}    
+              ]}
+            ]}
+          ]},
+          {"and": [
+            "Grapple",
+            {"simpleCycleFrames": 115},
+            {"cycleFrames": 20}
+          ]},
+          {"and": [
+            {"or": [
+              "Plasma",
+              "Wave",
+              "Spazer"
+            ]},
+            {"cycleFrames": 235}
+          ]},
+          {"cycleFrames": 275}
+        ]}
+      ],
+      "farmCycleDrops": [{"enemy": "Zoa", "count": 5}]
     },
     {
       "id": 72,
@@ -2415,8 +2482,23 @@
       "link": [6, 6],
       "name": "Zoa Farm",
       "requires": [
-        {"refill": ["Energy"]}
-      ]
+        {"or": [
+          {"and": [
+            "Grapple",
+            {"cycleFrames": 285}
+          ]},
+          {"and": [
+            "canDodgeWhileShooting",
+            {"or": [
+              "Wave",
+              "Spazer",
+              "canMidairWiggle"
+            ]},
+            {"cycleFrames": 525}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [{"enemy": "Zoa", "count": 5}]
     },
     {
       "id": 110,