diff --git a/lake_country/ebony/entrance1 b/lake_country/ebony/entrance1
index 5137359ab..76db35149 100644
--- a/lake_country/ebony/entrance1
+++ b/lake_country/ebony/entrance1
@@ -2,7 +2,7 @@ arch map
 name Ebony Tiger Thief Guild, Entrance
 difficulty 30
 region lakecountry
-width 16
+width 18
 height 16
 enter_x 13
 enter_y 14
@@ -1195,13 +1195,8 @@ end
 arch cobblestones
 x 8
 end
-arch button_plate
-x 8
-connected 11
-end
 arch dun2
 x 8
-move_block 0
 end
 arch cobblestones
 x 8
@@ -1389,19 +1384,8 @@ end
 arch cobblestones
 x 9
 end
-arch spikes_open
-x 9
-speed 0.500000
-value 1
-connected 10
-end
 arch dun2
 x 9
-move_block 0
-end
-arch boulder
-x 9
-invisible 1
 end
 arch cobblestones
 x 9
@@ -2510,3 +2494,138 @@ arch dun7
 x 15
 y 15
 end
+arch blocked
+x 16
+end
+arch blocked
+x 16
+y 1
+end
+arch blocked
+x 16
+y 2
+end
+arch blocked
+x 16
+y 3
+end
+arch blocked
+x 16
+y 4
+end
+arch blocked
+x 16
+y 5
+end
+arch blocked
+x 16
+y 6
+end
+arch blocked
+x 16
+y 7
+end
+arch blocked
+x 16
+y 8
+end
+arch blocked
+x 16
+y 9
+end
+arch blocked
+x 16
+y 10
+end
+arch blocked
+x 16
+y 11
+end
+arch blocked
+x 16
+y 12
+end
+arch blocked
+x 16
+y 13
+end
+arch blocked
+x 16
+y 14
+end
+arch blocked
+x 16
+y 15
+end
+arch button_plate
+x 17
+connected 11
+end
+arch spikes_open
+x 17
+y 1
+speed 0.500000
+value 1
+connected 10
+end
+arch boulder
+x 17
+y 1
+invisible 1
+end
+arch blocked
+x 17
+y 2
+end
+arch blocked
+x 17
+y 3
+end
+arch blocked
+x 17
+y 4
+end
+arch blocked
+x 17
+y 5
+end
+arch blocked
+x 17
+y 6
+end
+arch blocked
+x 17
+y 7
+end
+arch blocked
+x 17
+y 8
+end
+arch blocked
+x 17
+y 9
+end
+arch blocked
+x 17
+y 10
+end
+arch blocked
+x 17
+y 11
+end
+arch blocked
+x 17
+y 12
+end
+arch blocked
+x 17
+y 13
+end
+arch blocked
+x 17
+y 14
+end
+arch blocked
+x 17
+y 15
+end
diff --git a/lake_country/ebony/entrance2 b/lake_country/ebony/entrance2
index e3349b0f6..0abedc1d5 100644
--- a/lake_country/ebony/entrance2
+++ b/lake_country/ebony/entrance2
@@ -2,7 +2,7 @@ arch map
 name Ebony Tiger Thief Guild, Entrance
 difficulty 30
 region lakecountry
-width 16
+width 18
 height 16
 enter_x 13
 enter_y 14
@@ -945,10 +945,6 @@ arch dun2
 x 6
 y 15
 end
-arch button_plate
-x 7
-connected 11
-end
 arch dun2
 x 7
 move_block 0
@@ -1104,15 +1100,6 @@ arch dun2
 x 7
 y 15
 end
-arch spikes_open
-x 8
-speed 0.500000
-value 1
-connected 10
-end
-arch boulder
-x 8
-end
 arch dun2
 x 8
 move_block 0
@@ -2259,3 +2246,137 @@ arch dun7
 x 15
 y 15
 end
+arch blocked
+x 16
+end
+arch blocked
+x 16
+y 1
+end
+arch blocked
+x 16
+y 2
+end
+arch blocked
+x 16
+y 3
+end
+arch blocked
+x 16
+y 4
+end
+arch blocked
+x 16
+y 5
+end
+arch blocked
+x 16
+y 6
+end
+arch blocked
+x 16
+y 7
+end
+arch blocked
+x 16
+y 8
+end
+arch blocked
+x 16
+y 9
+end
+arch blocked
+x 16
+y 10
+end
+arch blocked
+x 16
+y 11
+end
+arch blocked
+x 16
+y 12
+end
+arch blocked
+x 16
+y 13
+end
+arch blocked
+x 16
+y 14
+end
+arch blocked
+x 16
+y 15
+end
+arch button_plate
+x 17
+connected 11
+end
+arch spikes_open
+x 17
+y 1
+speed 0.500000
+value 1
+connected 10
+end
+arch boulder
+x 17
+y 1
+end
+arch blocked
+x 17
+y 2
+end
+arch blocked
+x 17
+y 3
+end
+arch blocked
+x 17
+y 4
+end
+arch blocked
+x 17
+y 5
+end
+arch blocked
+x 17
+y 6
+end
+arch blocked
+x 17
+y 7
+end
+arch blocked
+x 17
+y 8
+end
+arch blocked
+x 17
+y 9
+end
+arch blocked
+x 17
+y 10
+end
+arch blocked
+x 17
+y 11
+end
+arch blocked
+x 17
+y 12
+end
+arch blocked
+x 17
+y 13
+end
+arch blocked
+x 17
+y 14
+end
+arch blocked
+x 17
+y 15
+end