diff --git a/src/room/planning/room/construction.rs b/src/room/planning/room/construction.rs
index 7d5b7c6..559c9d0 100644
--- a/src/room/planning/room/construction.rs
+++ b/src/room/planning/room/construction.rs
@@ -51,65 +51,74 @@ pub fn get_bunker_plan() -> Vec<(i8, i8, StructureType)> {
         // Stop labs
 
         // Start towers
-        (6, -1, StructureType::Tower),
-        (-6, -1, StructureType::Tower),
-        (0, -6, StructureType::Tower),
-        (4, -5, StructureType::Tower),
-        (-4, -5, StructureType::Tower),
+        (5, 2, StructureType::Tower),
+        (-5, 2, StructureType::Tower),
+        (4, -2, StructureType::Tower),
+        (-4, -2, StructureType::Tower),
+        (0, -5, StructureType::Tower),
+        (0, 5, StructureType::Tower),
         // Stop Towers
 
-        // Start various extensions
-        (4, 0, StructureType::Extension),
-        (5, 0, StructureType::Extension),
-        (-4, 0, StructureType::Extension),
-        (-5, 0, StructureType::Extension),
-        (4, 1, StructureType::Extension),
-        (5, 1, StructureType::Extension),
-        (-4, 1, StructureType::Extension),
-        (-5, 1, StructureType::Extension),
-        (5, 2, StructureType::Extension),
-        (-5, 2, StructureType::Extension),
+        // Extensions
+        (4, 6, StructureType::Extension),
+        (5, 5, StructureType::Extension),
+        (6, 4, StructureType::Extension),
+        (6, 3, StructureType::Extension),
+        (-4, 6, StructureType::Extension),
+        (-5, 5, StructureType::Extension),
+        (-6, 4, StructureType::Extension),
+        (-6, 3, StructureType::Extension),
+
         (2, 2, StructureType::Extension),
         (2, 3, StructureType::Extension),
         (3, 2, StructureType::Extension),
-        (-2, -2, StructureType::Extension),
-        (-2, -3, StructureType::Extension),
-        (-3, -2, StructureType::Extension),
-        (0, -5, StructureType::Extension),
-        (0, -6, StructureType::Extension),
-        (1, -6, StructureType::Extension),
-        (-1, -6, StructureType::Extension),
+        (-2, 2, StructureType::Extension),
+        (-2, 3, StructureType::Extension),
+        (-3, 2, StructureType::Extension),
+
+        (4, 1, StructureType::Extension),
+        (4, 0, StructureType::Extension),
+        (5, 0, StructureType::Extension),
+        (4, -1, StructureType::Extension),
+        (5, -1, StructureType::Extension),
+        (5, -2, StructureType::Extension),
+        (3, -3, StructureType::Extension),
+        (4, -3, StructureType::Extension),
+        (5, -3, StructureType::Extension),
         (1, -4, StructureType::Extension),
-        (1, -5, StructureType::Extension),
         (2, -4, StructureType::Extension),
-        (2, -5, StructureType::Extension),
         (3, -4, StructureType::Extension),
-        (3, -5, StructureType::Extension),
+        (4, -4, StructureType::Extension),
+
+        (-4, 1, StructureType::Extension),
+        (-4, 0, StructureType::Extension),
+        (-5, 0, StructureType::Extension),
+        (-4, -1, StructureType::Extension),
+        (-5, -1, StructureType::Extension),
+        (-5, -2, StructureType::Extension),
+        (-3, -3, StructureType::Extension),
+        (-4, -3, StructureType::Extension),
+        (-5, -3, StructureType::Extension),
         (-1, -4, StructureType::Extension),
-        (-1, -5, StructureType::Extension),
         (-2, -4, StructureType::Extension),
-        (-2, -5, StructureType::Extension),
         (-3, -4, StructureType::Extension),
-        (-3, -5, StructureType::Extension),
-        (4, -2, StructureType::Extension),
-        (5, -2, StructureType::Extension),
-        (4, -3, StructureType::Extension),
-        (5, -3, StructureType::Extension),
+        (-4, -4, StructureType::Extension),
+
+        (0, -6, StructureType::Extension),
+
+        (1, -6, StructureType::Extension),
+        (2, -6, StructureType::Extension),
+        (3, -6, StructureType::Extension),
+        (4, -6, StructureType::Extension),
+        (5, -5, StructureType::Extension),
         (6, -4, StructureType::Extension),
-        (-4, -2, StructureType::Extension),
-        (-5, -2, StructureType::Extension),
-        (-4, -3, StructureType::Extension),
-        (-5, -3, StructureType::Extension),
+
+        (-1, -6, StructureType::Extension),
+        (-2, -6, StructureType::Extension),
+        (-3, -6, StructureType::Extension),
+        (-4, -6, StructureType::Extension),
+        (-5, -5, StructureType::Extension),
         (-6, -4, StructureType::Extension),
-        (-6, 3, StructureType::Extension),
-        (-6, 4, StructureType::Extension),
-        (-5, 5, StructureType::Extension),
-        (-4, 6, StructureType::Extension),
-        (6, 3, StructureType::Extension),
-        (6, 4, StructureType::Extension),
-        (5, 5, StructureType::Extension),
-        (4, 6, StructureType::Extension),
-        // End various extensions
 
         // Fast-fill Ramparts
         (0, 0, StructureType::Rampart),