===================================================================
--- original.js
+++ change.js
@@ -56,9 +56,9 @@
 						//building.x = screenX;
 						//building.y = screenY;
 						building.asset.x = screenX;
 						building.asset.y = screenY;
-						//if (!building.asset.parent) 
+						//if (!building.asset.parent)
 						{
 							self.addChild(building.asset);
 						}
 						//console.log("Building at " + x + ',' + y, building);
@@ -196,15 +196,14 @@
 			globalTerrain[x][y] = 1;
 		}
 	}
 }
+// The instantiation of ConstructionYard is now moved after gameMap has been initialized and added to the game
 console.log("rockIlot2Center at " + rockIlot2Center.x + ',' + rockIlot2Center.y);
-gameMap.cells[rockIlot2Center.x][rockIlot2Center.y].building = new ConstructionYard(rockIlot2Center.x, rockIlot2Center.y);
-console.log('ConstructionYard cell :', gameMap.cells[rockIlot2Center.x][rockIlot2Center.y]);
-// Add the map to the game
+// Instantiate and initialize the Map
 var gameMap = new Map();
-gameMap.init(mapXSize, mapYSize); // Initialize with a 20x20 grid
-// This should be done after the map is fully initialized and ready to render
+gameMap.init(mapXSize, mapYSize); // Initialize with a 50x30 grid
+// Add the map to the game after it is fully initialized and ready to render
 game.addChild(gameMap);
 var isPressing = false;
 var dragStart = null;
 function handleDragStart(obj) {
@@ -230,8 +229,14 @@
 game.on('move', handleDragMove);
 game.on('up', handleDragEnd);
 // Instantiate CommandPanel
 var commandPanel = game.addChild(new CommandPanel());
+// Instantiate ConstructionYard buildings after the map has been initialized and added to the game
+console.log("rockIlot1Center at " + rockIlot1Center.x + ',' + rockIlot1Center.y);
+gameMap.cells[rockIlot1Center.x][rockIlot1Center.y].building = new ConstructionYard(rockIlot1Center.x, rockIlot1Center.y);
+console.log("rockIlot2Center at " + rockIlot2Center.x + ',' + rockIlot2Center.y);
+gameMap.cells[rockIlot2Center.x][rockIlot2Center.y].building = new ConstructionYard(rockIlot2Center.x, rockIlot2Center.y);
+console.log('ConstructionYard cell :', gameMap.cells[rockIlot2Center.x][rockIlot2Center.y]);
 // Game tick
 LK.on('tick', function () {
 	// Render the map each tick
 	gameMap.render();