diff --git a/region/norfair/east/Magdollite Tunnel.json b/region/norfair/east/Magdollite Tunnel.json
index 99d2b42ffc..cf582ecb48 100644
--- a/region/norfair/east/Magdollite Tunnel.json	
+++ b/region/norfair/east/Magdollite Tunnel.json	
@@ -88,8 +88,9 @@
       "name": "Magdollite Farm",
       "requires": [
         "h_heatProof",
-        {"refill": ["Energy", "Missile"]}
+        {"cycleFrames": 310}
       ],
+      "farmCycleDrops": [{"enemy": "Magdollite", "count": 3}],
       "flashSuitChecked": true
     },
     {
@@ -678,6 +679,18 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 2],
+      "name": "Double Magdollite Farm",
+      "requires": [
+        "h_heatProof",
+        "canTrickyJump",
+        {"cycleFrames": 320}
+      ],
+      "farmCycleDrops": [{"enemy": "Magdollite", "count": 6}],
+      "flashSuitChecked": true,
+      "note": "It may help to desynchronize the Magdollites by bringing them on camera at different times."
+    },
     {
       "id": 27,
       "link": [2, 2],
diff --git a/region/norfair/east/Norfair Reserve Tank Room.json b/region/norfair/east/Norfair Reserve Tank Room.json
index eb18c7bd40..462f270473 100644
--- a/region/norfair/east/Norfair Reserve Tank Room.json	
+++ b/region/norfair/east/Norfair Reserve Tank Room.json	
@@ -136,18 +136,80 @@
     {
       "id": 2,
       "link": [1, 1],
-      "name": "Sova Farm",
+      "name": "Single Sova Farm",
+      "requires": [
+        "h_heatProof",
+        "canCarefulJump",
+        {"or": [
+          "Wave",
+          "Spazer",
+          "Plasma",
+          "Grapple",
+          {"and": [
+            "canTrickyJump",
+            {"cycleFrames": 50}
+          ]}
+          
+        ]},
+        {"cycleFrames": 110}
+      ],
+      "resetsObstacles": ["A"],
+      "farmCycleDrops": [{"enemy": "Sova", "count": 1}],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [1, 1],
+      "name": "Triple Sova Farm",
       "requires": [
         "h_heatProof",
         {"or": [
           "h_lavaProof",
-          "canDodgeWhileShooting"
+          "canInsaneJump",
+          {"and": [
+            "canDodgeWhileShooting",
+            "Plasma"
+          ]}
         ]},
-        "Plasma",
-        {"partialRefill": {"type": "Energy", "limit": 120}},
-        {"partialRefill": {"type": "Super", "limit": 2}},
-        {"partialRefill": {"type": "Missile", "limit": 6}}
-      ]
+        {"or": [
+          "Wave",
+          "Spazer",
+          "Plasma"
+        ]},
+        {"cycleFrames": 470}
+      ],
+      "resetsObstacles": ["A"],
+      "farmCycleDrops": [{"enemy": "Sova", "count": 3}],
+      "flashSuitChecked": true,
+      "devNote": "Heat scaling makes up the difference in platforming ability."
+    },
+    {
+      "link": [1, 1],
+      "name": "Full Farm",
+      "requires": [
+        "h_heatProof",
+        "h_lavaProof",
+        {"resetRoom": {"nodes": [1]}},
+        {"or": [
+          "ScrewAttack",
+          "Plasma",
+          {"and": [
+            "canPseudoScrew",
+            {"or": [
+              "Wave",
+              "Spazer",
+              {"cycleFrames": 420}
+            ]},
+            {"cycleFrames": 390}
+          ]}
+        ]},
+        {"cycleFrames": 300}
+      ],
+      "clearsObstacles": ["A"],
+      "farmCycleDrops": [
+        {"enemy": "Sova", "count": 3},
+        {"enemy": "Dragon", "count": 3}
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 3,
diff --git a/region/norfair/east/Purple Farming Room.json b/region/norfair/east/Purple Farming Room.json
index 36f71c4bae..065b5a5c23 100644
--- a/region/norfair/east/Purple Farming Room.json	
+++ b/region/norfair/east/Purple Farming Room.json	
@@ -121,9 +121,8 @@
       "flashSuitChecked": true
     },
     {
-      "id": 4,
       "link": [2, 2],
-      "name": "Gamet Farm",
+      "name": "Approach Farm",
       "requires": [
         {"or": [
           {"and": [
@@ -132,8 +131,23 @@
           ]},
           {"heatFrames": 50}
         ]},
-        {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
-      ]
+        {"partialRefill": {"type": "RegularEnergy", "limit": 50}}
+      ],
+      "flashSuitChecked": true,
+      "note": "Regain some energy in order to use the Gamet Farm."
+    },
+    {
+      "id": 4,
+      "link": [2, 2],
+      "name": "Gamet Farm",
+      "requires": [
+        {"simpleHeatFrames": 100},
+        {"heatFrames": 20},
+        {"simpleCycleFrames": 100},
+        {"cycleFrames": 20}
+      ],
+      "farmCycleDrops": [{"enemy": "Gamet", "count": 5}],
+      "flashSuitChecked": true
     }
   ],
   "notables": [],
diff --git a/region/norfair/east/Red Pirate Shaft.json b/region/norfair/east/Red Pirate Shaft.json
index d4af667f08..be7e55e280 100644
--- a/region/norfair/east/Red Pirate Shaft.json	
+++ b/region/norfair/east/Red Pirate Shaft.json	
@@ -97,6 +97,86 @@
       ],
       "devNote": "This strat is not useful in-room, but can satisfy a strat in the room before with an exit shinespark."
     },
+    {
+      "link": [1, 1],
+      "name": "Pirate and Geemer Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [1]}},
+        {"or": [
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 510}
+          ]},
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 630}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Geemer (grey)", "count": 4},
+        {"enemy": "Red Space Pirate (standing)", "count": 3}
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Pirate Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [1]}},
+        {"or": [
+          {"and": [
+            "canPseudoScrew",
+            {"cycleFrames": 480}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 560}
+          ]},
+          {"and": [
+            "Wave",
+            {"cycleFrames": 560}
+          ]},
+          {"and": [
+            "Spazer",
+            {"cycleFrames": 560}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [{"enemy": "Red Space Pirate (standing)", "count": 3}]
+    },
+    {
+      "link": [1, 1],
+      "name": "Geemer Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [1]}},
+        {"or": [
+          {"and": [
+            "Grapple",
+            {"cycleFrames": 480}
+          ]},
+          {"and": [
+            "h_useMorphBombs",
+            {"cycleFrames": 690}
+          ]}
+        ]},
+        {"or": [
+          "HiJump",
+          {"and": [
+            "canWalljump",
+            {"cycleFrames": 60}
+          ]},
+          {"and": [
+            "SpaceJump",
+            {"cycleFrames": 120}
+          ]},
+          {"and": [
+            "canTrickyJump",
+            {"cycleFrames": 200}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [{"enemy": "Geemer (grey)", "count": 4}]
+    },
     {
       "id": 3,
       "link": [1, 1],
@@ -240,6 +320,86 @@
       },
       "note": "Knock a Geemer off with a Super then follow it back to the top. Grey Geemers can only be frozen with Plasma."
     },
+    {
+      "link": [2, 2],
+      "name": "Pirate and Geemer Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [2]}},
+        {"or": [
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 540}
+          ]},
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 570}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Geemer (grey)", "count": 4},
+        {"enemy": "Red Space Pirate (standing)", "count": 3}
+      ]
+    },
+    {
+      "link": [2, 2],
+      "name": "Geemer Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [2]}},
+        {"or": [
+          {"and": [
+            "Grapple",
+            {"cycleFrames": 440}
+          ]},
+          {"and": [
+            "h_useMorphBombs",
+            {"cycleFrames": 960}
+          ]}
+        ]},
+        {"or": [
+          "HiJump",
+          {"and": [
+            "canWalljump",
+            {"cycleFrames": 60}
+          ]},
+          {"and": [
+            "SpaceJump",
+            {"cycleFrames": 120}
+          ]},
+          {"and": [
+            "canTrickyJump",
+            {"cycleFrames": 200}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [{"enemy": "Geemer (grey)", "count": 4}]
+    },
+    {
+      "link": [2, 2],
+      "name": "Pirate Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [2]}},
+        {"or": [
+          {"and": [
+            "canPseudoScrew",
+            {"cycleFrames": 570}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 640}
+          ]},
+          {"and": [
+            "Wave",
+            {"cycleFrames": 570}
+          ]},
+          {"and": [
+            "Spazer",
+            {"cycleFrames": 640}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [{"enemy": "Red Space Pirate (standing)", "count": 3}]
+    },
     {
       "id": 12,
       "link": [2, 2],