===================================================================
--- original.js
+++ change.js
@@ -383,41 +383,20 @@
 var currentWave = 0;
 // Spawn wave function
 function spawnWave() {
 	// Define the layout of the obstacles for each wave
-	var obstacleLayouts = [
-	// Previous wave: two obstacles forming a line
-	'line',
-	// First wave: four obstacles forming a square
-	'square',
-	// Second wave: three obstacles forming a triangle
-	'triangle',
-	// Third wave: ten obstacles forming a circle
-	'circle',
-	// Fourth wave: five obstacles forming a cross
-	'cross',
-	// Fifth wave: six obstacles forming a hexagon
-	'hexagon',
-	// Sixth wave: seven obstacles forming a heptagon
-	'heptagon',
-	// Seventh wave: eight obstacles forming an octagon
-	'octagon',
-	// Eighth wave: nine obstacles forming a nonagon
-	'nonagon',
-	// Ninth wave: ten obstacles forming a decagon
-	'decagon'];
-	// Get the layout for the current wave
-	var layout = obstacleLayouts[Math.floor(Math.random() * obstacleLayouts.length)];
-	// Define the positions for each layout
-	var positions = {
-		'line': [{
+	var obstacleLayouts = [{
+		type: 'line',
+		positions: [{
 			x: 4,
 			y: 2
 		}, {
 			x: 6,
 			y: 2
-		}],
-		'square': [{
+		}]
+	}, {
+		type: 'square',
+		positions: [{
 			x: 2,
 			y: 2
 		}, {
 			x: 2,
@@ -427,20 +406,24 @@
 			y: 2
 		}, {
 			x: 7,
 			y: 7
-		}],
-		'triangle': [{
+		}]
+	}, {
+		type: 'triangle',
+		positions: [{
 			x: 5,
 			y: 2
 		}, {
 			x: 2,
 			y: 7
 		}, {
 			x: 8,
 			y: 7
-		}],
-		'circle': [{
+		}]
+	}, {
+		type: 'circle',
+		positions: [{
 			x: 5,
 			y: 2
 		}, {
 			x: 6,
@@ -453,10 +436,12 @@
 			y: 5
 		}, {
 			x: 6,
 			y: 6
-		}],
-		'cross': [{
+		}]
+	}, {
+		type: 'cross',
+		positions: [{
 			x: 5,
 			y: 2
 		}, {
 			x: 5,
@@ -469,10 +454,12 @@
 			y: 3
 		}, {
 			x: 6,
 			y: 3
-		}],
-		'hexagon': [{
+		}]
+	}, {
+		type: 'hexagon',
+		positions: [{
 			x: 5,
 			y: 2
 		}, {
 			x: 6,
@@ -491,10 +478,12 @@
 			y: 3.5
 		}, {
 			x: 4,
 			y: 2.5
-		}],
-		'heptagon': [{
+		}]
+	}, {
+		type: 'heptagon',
+		positions: [{
 			x: 5,
 			y: 2
 		}, {
 			x: 6,
@@ -513,10 +502,12 @@
 			y: 2.5
 		}, {
 			x: 5,
 			y: 3
-		}],
-		'octagon': [{
+		}]
+	}, {
+		type: 'octagon',
+		positions: [{
 			x: 5,
 			y: 2
 		}, {
 			x: 6,
@@ -538,10 +529,12 @@
 			y: 3
 		}, {
 			x: 5,
 			y: 3.5
-		}],
-		'nonagon': [{
+		}]
+	}, {
+		type: 'nonagon',
+		positions: [{
 			x: 5,
 			y: 2
 		}, {
 			x: 6,
@@ -566,10 +559,12 @@
 			y: 3.5
 		}, {
 			x: 5,
 			y: 2.5
-		}],
-		'decagon': [{
+		}]
+	}, {
+		type: 'decagon',
+		positions: [{
 			x: 5,
 			y: 2
 		}, {
 			x: 6,
@@ -598,25 +593,26 @@
 		}, {
 			x: 5,
 			y: 4.5
 		}]
-	};
-	// Get the positions for the current layout
-	var layoutPositions = positions[layout];
-	if (!layoutPositions) {
-		console.error('Error: layoutPositions is undefined. Check the layout variable and the positions object.');
+	}];
+	// Get the layout for the current wave
+	var layout = obstacleLayouts[currentWave];
+	if (!layout) {
+		console.error('Error: layout is undefined. Check the obstacleLayouts array.');
 		return;
 	}
+	var layoutPositions = layout.positions;
 	// Randomly choose an obstacle type for the entire wave
 	var obstacleTypes = [Obstacle1, Obstacle2, Obstacle3];
 	var obstacleType = obstacleTypes[Math.floor(Math.random() * obstacleTypes.length)];
-	for (var i = 0; i < layoutPositions.length; i++) {
+	layoutPositions.forEach(function (position) {
 		var obstacle = game.addChild(new obstacleType());
 		// Position the obstacles according to the layout, using the grid for positioning
-		obstacle.x = 2048 / 2 + (layoutPositions[i].x - gridSize / 2) * cellSize;
-		obstacle.y = 2732 + layoutPositions[i].y * cellSize; // Spawn obstacles offscreen at the bottom
+		obstacle.x = 2048 / 2 + (position.x - gridSize / 2) * cellSize;
+		obstacle.y = 2732 + position.y * cellSize; // Spawn obstacles offscreen at the bottom
 		obstacles.push(obstacle);
-	}
+	});
 	currentWave++;
 	if (obstaclesPerWave && currentWave >= obstaclesPerWave.length) {
 		currentWave = 0;
 	}