diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_valley.cpp
index 857472d77..4fe3c6ed5 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_valley.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_valley.cpp
@@ -16,7 +16,7 @@ void RegionTable_Init_GerudoValley() {
         Entrance(RR_GV_UPPER_STREAM,  []{return logic->IsChild || logic->HasItem(RG_BRONZE_SCALE) || logic->TakeDamage();}),
         Entrance(RR_GV_CRATE_LEDGE,   []{return logic->IsChild || logic->CanUse(RG_LONGSHOT);}),
         Entrance(RR_GV_GROTTO_LEDGE,  []{return true;}),
-        Entrance(RR_GV_FORTRESS_SIDE, []{return (logic->IsAdult && (logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || logic->CarpenterRescue)) || (logic->IsChild && logic->CanUse(RG_HOOKSHOT));}),
+        Entrance(RR_GV_FORTRESS_SIDE, []{return (logic->IsAdult && (logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || logic->CanFinishGerudoFortress())) || (logic->IsChild && logic->CanUse(RG_HOOKSHOT));}),
         Entrance(RR_GV_LOWER_STREAM,  []{return logic->IsChild;}), //can use cucco as child
     });
 
@@ -73,7 +73,7 @@ void RegionTable_Init_GerudoValley() {
         //Exits
         Entrance(RR_GF_GROUND_BOTTOM,  []{return true;}),
         Entrance(RR_GV_UPPER_STREAM,   []{return true;}),
-        Entrance(RR_GERUDO_VALLEY,     []{return logic->IsChild || logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || logic->CarpenterRescue;}),
+        Entrance(RR_GERUDO_VALLEY,     []{return logic->IsChild || logic->CanUse(RG_EPONA) || logic->CanUse(RG_LONGSHOT) || ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE) || logic->CanFinishGerudoFortress();}),
         Entrance(RR_GV_CARPENTER_TENT, []{return logic->IsAdult;}),
         Entrance(RR_GV_STORMS_GROTTO,  []{return logic->IsAdult && logic->CanOpenStormsGrotto();}),
         Entrance(RR_GV_CRATE_LEDGE,    []{return ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives();}),
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp
index 0fdcc8cbc..e7b4324bf 100644
--- a/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp
@@ -6,7 +6,7 @@ using namespace Rando;
 void RegionTable_Init_ThievesHideout() {
     areaTable[RR_TH_NORTH_F1_CARPENTER_AREA] = Region("Thieves Hideout North F1 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
         //Events
-        EventAccess(&logic->CarpenterRescue, []{return logic->CanFinishGerudoFortress();}),
+        EventAccess(&logic->TH_RescuedF1NorthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
     }, {
         //Locations
         LOCATION(RC_TH_NORTH_F1_CARPENTER,       logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
@@ -22,7 +22,7 @@ void RegionTable_Init_ThievesHideout() {
 
     areaTable[RR_TH_SOUTH_F1_CARPENTER_AREA] = Region("Thieves Hideout South F1 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
         //Events
-        EventAccess(&logic->CarpenterRescue, []{return logic->CanFinishGerudoFortress();}),
+        EventAccess(&logic->TH_RescuedF1SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
     }, {
         //Locations
         LOCATION(RC_TH_SOUTH_F1_CARPENTER,            logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
@@ -42,7 +42,7 @@ void RegionTable_Init_ThievesHideout() {
 
     areaTable[RR_TH_NORTH_F2_CARPENTER_AREA] = Region("Thieves Hideout North F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
         //Events
-        EventAccess(&logic->CarpenterRescue, []{return logic->CanFinishGerudoFortress();}),
+        EventAccess(&logic->TH_RescuedF2NorhCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
     }, {
         //Locations
         LOCATION(RC_TH_NORTH_F2_CARPENTER,       logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
@@ -56,7 +56,7 @@ void RegionTable_Init_ThievesHideout() {
 
     areaTable[RR_TH_SOUTH_F2_CARPENTER_AREA] = Region("Thieves Hideout South F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
         //Events
-        EventAccess(&logic->CarpenterRescue, []{return logic->CanFinishGerudoFortress();}),
+        EventAccess(&logic->TH_RescuedF2SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
     }, {
         //Locations
         LOCATION(RC_TH_SOUTH_F2_CARPENTER,     logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 0ec2a5e97..ddac4edc7 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -1216,10 +1216,28 @@ namespace Rando {
         return hasState;
     }
 
-    bool Logic::CanFinishGerudoFortress(){
-        return (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_NORMAL) && SmallKeys(RR_GF_GROUND_BOTTOM, 4) && CanKillEnemy(RE_GERUDO_WARRIOR) && (HasItem(RG_GERUDO_MEMBERSHIP_CARD) || CanUse(RG_FAIRY_BOW) || CanUse(RG_HOOKSHOT) || CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_TH_KITCHEN))) ||
-               (ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FAST)   && SmallKeys(RR_GF_GROUND_BOTTOM, 1) && CanKillEnemy(RE_GERUDO_WARRIOR)) ||
-               ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE);
+    bool Logic::CanFinishGerudoFortress() {
+        switch (ctx->GetOption(RSK_GERUDO_FORTRESS).Get()) {
+            case RO_GF_CARPENTERS_NORMAL:
+                return SmallKeys(RR_GF_GROUND_BOTTOM, 4) &&
+                    TH_RescuedF1NorthCarpenter &&
+                    TH_RescuedF1SouthCarpenter &&
+                    TH_RescuedF2NorthCarpenter &&
+                    TH_RescuedF2SouthCarpenter;
+            case RO_GF_CARPENTERS_FAST:
+                return SmallKeys(RR_GF_GROUND_BOTTOM, 1) &&
+                    (
+                        TH_RescuedF1NorthCarpenter ||
+                        TH_RescuedF1SouthCarpenter ||
+                        TH_RescuedF2NorthCarpenter ||
+                        TH_RescuedF2SouthCarpenter
+                    );
+            case RO_GF_CARPENTERS_FREE:
+                return true;
+            default:
+                assert(false);
+                return true;
+        }
     }
 
     bool Logic::CanStandingShield(){
@@ -2283,67 +2301,70 @@ namespace Rando {
         GetSaveContext()->linkAge = !ctx->GetOption(RSK_SELECTED_STARTING_AGE).Get();
 
         //Events
-        ShowedMidoSwordAndShield  = false;
-        CarpenterRescue           = false;
-        GF_GateOpen               = false;
-        GtG_GateOpen              = false;
-        DampesWindmillAccess      = false;
-        DrainWell                 = false;
-        GoronCityChildFire        = false;
-        GCWoodsWarpOpen           = false;
-        GCDaruniasDoorOpenChild   = false;
-        StopGCRollingGoronAsAdult = false;
-        CanWaterTempleLowFromHigh = false;
-        CanWaterTempleLowFromMid  = false;
-        CanWaterTempleMiddle      = false;
-        CanWaterTempleHigh        = false;
-        KakarikoVillageGateOpen   = false;
-        KingZoraThawed            = false;
-        ForestTempleJoelle        = false;
-        ForestTempleBeth          = false;
-        ForestTempleAmy           = false;
-        ForestTempleMeg           = false;
-        FireLoopSwitch            = false;
-        LinksCow                  = false;
-        DeliverLetter             = false;
-        ClearMQDCUpperLobbyRocks  = false;
-        LoweredWaterInsideBotw    = false;
-        OpenedWestRoomMQBotw      = false;
-        OpenedMiddleHoleMQBotw    = false;
-        BrokeDeku1FWeb            = false;
-        ClearedMQDekuSERoom       = false;
-        MQDekuWaterRoomTorches    = false;
-        PushedDekuBasementBlock   = false;
-        OpenedLowestGoronCage     = false;
-        OpenedUpperFireShortcut   = false;
-        HitFireTemplePlatform     = false;
-        OpenedFireMQFireMazeDoor  = false;
-        MQForestBlockRoomTargets  = false;
-        ForestCanTwistHallway     = false;
-        ForestClearBelowBowChest  = false;
-        ForestOpenBossCorridor    = false;
-        ShadowTrialFirstChest     = false;
-        MQGTGMazeSwitch           = false;
-        GTGPlatformSilverRupees   = false;
-        MQJabuHolesRoomDoor       = false;
-        JabuWestTentacle          = false;
-        JabuEastTentacle          = false;
-        JabuNorthTentacle         = false;
-        LoweredJabuPath           = false;
-        MQJabuLiftRoomCow         = false;
-        MQShadowFloorSpikeRupees  = false;
-        ShadowShortcutBlock       = false;
-        MQWaterStalfosPit         = false;
-        MQWaterDragonTorches      = false;
-        MQWaterB1Switch           = false;
-        //MQWaterPillarSoTBlock     = false;
-        MQWaterOpenedPillarB1     = false;
-        MQSpiritCrawlBoulder      = false;
-        MQSpiritMapRoomEnemies    = false;
-        MQSpirit3SunsEnemies      = false;
-        Spirit1FSilverRupees      = false;
-        JabuRutoInB1              = false;
-        JabuRutoIn1F              = false;
+        ShowedMidoSwordAndShield   = false;
+        TH_RescuedF1NorthCarpenter = false;
+        TH_RescuedF1SouthCarpenter = false;
+        TH_RescuedF2NorthCarpenter = false;
+        TH_RescuedF2SouthCarpenter = false;
+        GF_GateOpen                = false;
+        GtG_GateOpen               = false;
+        DampesWindmillAccess       = false;
+        DrainWell                  = false;
+        GoronCityChildFire         = false;
+        GCWoodsWarpOpen            = false;
+        GCDaruniasDoorOpenChild    = false;
+        StopGCRollingGoronAsAdult  = false;
+        CanWaterTempleLowFromHigh  = false;
+        CanWaterTempleLowFromMid   = false;
+        CanWaterTempleMiddle       = false;
+        CanWaterTempleHigh         = false;
+        KakarikoVillageGateOpen    = false;
+        KingZoraThawed             = false;
+        ForestTempleJoelle         = false;
+        ForestTempleBeth           = false;
+        ForestTempleAmy            = false;
+        ForestTempleMeg            = false;
+        FireLoopSwitch             = false;
+        LinksCow                   = false;
+        DeliverLetter              = false;
+        ClearMQDCUpperLobbyRocks   = false;
+        LoweredWaterInsideBotw     = false;
+        OpenedWestRoomMQBotw       = false;
+        OpenedMiddleHoleMQBotw     = false;
+        BrokeDeku1FWeb             = false;
+        ClearedMQDekuSERoom        = false;
+        MQDekuWaterRoomTorches     = false;
+        PushedDekuBasementBlock    = false;
+        OpenedLowestGoronCage      = false;
+        OpenedUpperFireShortcut    = false;
+        HitFireTemplePlatform      = false;
+        OpenedFireMQFireMazeDoor   = false;
+        MQForestBlockRoomTargets   = false;
+        ForestCanTwistHallway      = false;
+        ForestClearBelowBowChest   = false;
+        ForestOpenBossCorridor     = false;
+        ShadowTrialFirstChest      = false;
+        MQGTGMazeSwitch            = false;
+        GTGPlatformSilverRupees    = false;
+        MQJabuHolesRoomDoor        = false;
+        JabuWestTentacle           = false;
+        JabuEastTentacle           = false;
+        JabuNorthTentacle          = false;
+        LoweredJabuPath            = false;
+        MQJabuLiftRoomCow          = false;
+        MQShadowFloorSpikeRupees   = false;
+        ShadowShortcutBlock        = false;
+        MQWaterStalfosPit          = false;
+        MQWaterDragonTorches       = false;
+        MQWaterB1Switch            = false;
+        //MQWaterPillarSoTBlock      = false;
+        MQWaterOpenedPillarB1      = false;
+        MQSpiritCrawlBoulder       = false;
+        MQSpiritMapRoomEnemies     = false;
+        MQSpirit3SunsEnemies       = false;
+        Spirit1FSilverRupees       = false;
+        JabuRutoInB1               = false;
+        JabuRutoIn1F               = false;
 
         StopPerformanceTimer(PT_LOGIC_RESET);
     }
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 4286cc5c3..a5cf370dc 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -112,7 +112,10 @@ class Logic {
 
     // Events
     bool ShowedMidoSwordAndShield = false;
-    bool CarpenterRescue = false;
+    bool TH_RescuedF1NorthCarpenter = false;
+    bool TH_RescuedF1SouthCarpenter = false;
+    bool TH_RescuedF2NorthCarpenter = false;
+    bool TH_RescuedF2SouthCarpenter = false;
     bool GF_GateOpen = false;
     bool GtG_GateOpen = false;
     bool DampesWindmillAccess = false;