diff --git a/Rom.py b/Rom.py
index 64745298..9b06ec57 100644
--- a/Rom.py
+++ b/Rom.py
@@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'fef56e6629ee9fe1de52b7842beb333d'
+RANDOMIZERBASEHASH = '47e937d11855bc775587fe2a7acfa3a3'
 
 
 class JsonRom(object):
diff --git a/asm/doortables.asm b/asm/doortables.asm
index e427fd48..db1b6711 100644
--- a/asm/doortables.asm
+++ b/asm/doortables.asm
@@ -574,29 +574,14 @@ dw $0058, $0148, $0198, $0190
 
 org $27E000
 CutoffRooms:
-; Room, quad, y max, x max, x min
-dw $00bc, $0007, $0009, $0003  ; TT Alcove
-dw $00a2, $0007, $000b, $0000  ; Mire Bridge Left & Right
-dw $00a3, $0009, $0008, $0004  ; Mire Bent Bridge
-dw $00c2, $0007, $0008, $0000  ; Mire Hub
-;dw $00c2, $0004, $0008, $0004  ; Mire Hub
-dw $001a, $0007, $0008, $0004  ; Pod Falling & Harmless
-dw $0049, $0004, $0008, $0004  ; SW Star Pits
-dw $0014, $0009, $0008, $0004  ; TR Lava Escape & TR Dual Pipes
-dw $008c, $0009, $0008, $0004  ; Bob's Room & GT Big Chest
-
-dw $009f, $0009, $000a, $0002  ; Ice Many Pots
-dw $0066, $0009, $0008, $0000  ; Swamp Waterfall
-dw $005d, $0007, $000b, $0000  ; GT Gauntlet 3
-dw $00a8, $0007, $0008, $0004  ; Eastern Push Block
-dw $00a9, $0009, $0009, $0003  ; Eastern Courtyard
-dw $00aa, $0009, $0009, $0003  ; Eastern Map Valley
-dw $00b9, $0008, $000b, $0000  ; Eastern Cannonball
-dw $0052, $0008, $000a, $0003  ; HC East Hall - affects both doors
-
-dw $0050, $0009, $000a, $0002  ; HC West Hall
-dw $00c5, $0008, $0008, $0000  ; TR Dash Bridge
-dw $00c6, $0007, $0008, $0004  ; TR Hub
+; TT Alcove, Mire Bridge Left & Right, Mire Bent Bridge, Mire Hub
+; Pod Falling & Harmless, SW Star Pits, TR Lava Escape & TR Dual Pipes, Bob's Room & GT Big Chest
+dw $00bc, $00a2, $00a3, $00c2, $001a, $0049, $0014, $008c
+; Ice Many Pots, Swamp Waterfall, GT Gauntlet 3, Eastern Push Block, Eastern Courtyard, Eastern Map Valley
+; Eastern Cannonball, HC East Hall
+dw $009f, $0066, $005d, $00a8, $00a9, $00aa, $00b9, $0052
+; HC West Hall, TR Dash Bridge, TR Hub, Pod Arena, GT Petting Zoo
+dw $0050, $00c5, $00c6, $0009, $0003, $002a, $007d
 dw $ffff
 
 ; dungeon tables
diff --git a/asm/overrides.asm b/asm/overrides.asm
index 40d48e5c..f9842866 100644
--- a/asm/overrides.asm
+++ b/asm/overrides.asm
@@ -93,13 +93,13 @@ CutoffEntranceRug:
         cmp #$000C : BNE .norm
           + LDX #$0000 : LDA !CutoffTable, x
           	- CMP.W $A0 : BEQ .check
-           	TXA : !ADD #$0008 : TAX : LDA !CutoffTable, x : CMP.w #$FFFF : BNE -
+           	INX #2 : LDA !CutoffTable, x : CMP.w #$FFFF : BNE -
     .norm PLX : PLA : LDA $9B52, y : STA $7E2000, x ; what we wrote over
 RTL
      .check
-		  LDA $0c : CMP.l !CutoffTable+2, x : !BGE .skip
-		  LDA $0e : CMP.l !CutoffTable+4, x : !BGE .skip
-		  CMP.l !CutoffTable+6, x : !BLT .skip
+		  LDA $0c : CMP #$0004 : !BGE .skip
+		  LDA $0e : CMP #$0008 : !BGE .skip
+		  CMP.l #$0004 : !BLT .skip
       BRA .norm
 .skip PLX : PLA : RTL
 
diff --git a/data/base2current.bps b/data/base2current.bps
index 7d08f367..cf03abef 100644
Binary files a/data/base2current.bps and b/data/base2current.bps differ