===================================================================
--- original.js
+++ change.js
@@ -156,192 +156,68 @@
 			}
 		}
 	};
 });
+// Obstacle2 class
 var Obstacle2 = Container.expand(function () {
 	var self = Container.call(this);
 	var obstacle2Graphics = self.attachAsset('obstacle2', {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
+	// Set obstacle2 speed
 	self.speed = -5;
+	// This is automatically called every game tick, if the obstacle2 is attached!
 	self.update = function () {
+		// Check if the obstacle is colliding with the shield
 		if (self.intersects(shield)) {
+			// Calculate the direction vector between the shield and the obstacle
 			var dx = self.x - shield.x;
 			var dy = self.y - shield.y;
 			var distance = Math.sqrt(dx * dx + dy * dy);
+			// Normalize the direction vector
 			dx /= distance;
 			dy /= distance;
+			// Push the obstacle away from the shield
 			self.x += dx * 5;
 			self.y += dy * 5;
 		}
+		// Check for collision with diver
 		if (self.intersects(diver)) {
+			// Flash screen red for 1 second (1000ms) to show game over
 			LK.effects.flashScreen(0xff0000, 1000);
+			// Show game over. The game will be automatically paused while game over is showing.
 			LK.showGameOver();
 		}
+		// Continue moving upwards
 		self.y += self.speed;
-		self.rotation += 0.01;
-		self.scale.x = 1 + Math.sin(LK.ticks / 10) * 0.02;
-		self.scale.y = 1 + Math.sin(LK.ticks / 10) * 0.02;
+		// Add wiggly movement to the obstacle
+		self.x += Math.sin(LK.ticks / 10) * 2;
 		if (self.y < 0) {
 			self.destroy();
 			var index = obstacles.indexOf(self);
 			if (index > -1) {
 				obstacles.splice(index, 1);
 			}
 		}
+		// Check if the obstacle is colliding with another obstacle
 		for (var i = 0; i < obstacles.length; i++) {
 			var otherObstacle = obstacles[i];
 			if (self !== otherObstacle && self.intersects(otherObstacle)) {
+				// Calculate the direction vector between the two obstacles
 				var dx = self.x - otherObstacle.x;
 				var dy = self.y - otherObstacle.y;
 				var distance = Math.sqrt(dx * dx + dy * dy);
+				// Normalize the direction vector
 				dx /= distance;
 				dy /= distance;
+				// Increase the repulsion force and always push the obstacle to the outside
 				self.x += dx * 10;
 				self.y += dy * 10;
 			}
 		}
 	};
 });
-var Obstacle3 = Container.expand(function () {
-	var self = Container.call(this);
-	var obstacle3Graphics = self.attachAsset('obstacle3', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	self.speed = -5;
-	self.update = function () {
-		if (self.intersects(shield)) {
-			var dx = self.x - shield.x;
-			var dy = self.y - shield.y;
-			var distance = Math.sqrt(dx * dx + dy * dy);
-			dx /= distance;
-			dy /= distance;
-			self.x += dx * 5;
-			self.y += dy * 5;
-		}
-		if (self.intersects(diver)) {
-			LK.effects.flashScreen(0xff0000, 1000);
-			LK.showGameOver();
-		}
-		self.y += self.speed;
-		self.rotation += 0.01;
-		self.scale.x = 1 + Math.sin(LK.ticks / 10) * 0.02;
-		self.scale.y = 1 + Math.sin(LK.ticks / 10) * 0.02;
-		if (self.y < 0) {
-			self.destroy();
-			var index = obstacles.indexOf(self);
-			if (index > -1) {
-				obstacles.splice(index, 1);
-			}
-		}
-		for (var i = 0; i < obstacles.length; i++) {
-			var otherObstacle = obstacles[i];
-			if (self !== otherObstacle && self.intersects(otherObstacle)) {
-				var dx = self.x - otherObstacle.x;
-				var dy = self.y - otherObstacle.y;
-				var distance = Math.sqrt(dx * dx + dy * dy);
-				dx /= distance;
-				dy /= distance;
-				self.x += dx * 10;
-				self.y += dy * 10;
-			}
-		}
-	};
-});
-var Obstacle4 = Container.expand(function () {
-	var self = Container.call(this);
-	var obstacle4Graphics = self.attachAsset('obstacle4', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	self.speed = -5;
-	self.update = function () {
-		if (self.intersects(shield)) {
-			var dx = self.x - shield.x;
-			var dy = self.y - shield.y;
-			var distance = Math.sqrt(dx * dx + dy * dy);
-			dx /= distance;
-			dy /= distance;
-			self.x += dx * 5;
-			self.y += dy * 5;
-		}
-		if (self.intersects(diver)) {
-			LK.effects.flashScreen(0xff0000, 1000);
-			LK.showGameOver();
-		}
-		self.y += self.speed;
-		self.rotation += 0.01;
-		self.scale.x = 1 + Math.sin(LK.ticks / 10) * 0.02;
-		self.scale.y = 1 + Math.sin(LK.ticks / 10) * 0.02;
-		if (self.y < 0) {
-			self.destroy();
-			var index = obstacles.indexOf(self);
-			if (index > -1) {
-				obstacles.splice(index, 1);
-			}
-		}
-		for (var i = 0; i < obstacles.length; i++) {
-			var otherObstacle = obstacles[i];
-			if (self !== otherObstacle && self.intersects(otherObstacle)) {
-				var dx = self.x - otherObstacle.x;
-				var dy = self.y - otherObstacle.y;
-				var distance = Math.sqrt(dx * dx + dy * dy);
-				dx /= distance;
-				dy /= distance;
-				self.x += dx * 10;
-				self.y += dy * 10;
-			}
-		}
-	};
-});
-var Obstacle5 = Container.expand(function () {
-	var self = Container.call(this);
-	var obstacle5Graphics = self.attachAsset('obstacle5', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	self.speed = -5;
-	self.update = function () {
-		if (self.intersects(shield)) {
-			var dx = self.x - shield.x;
-			var dy = self.y - shield.y;
-			var distance = Math.sqrt(dx * dx + dy * dy);
-			dx /= distance;
-			dy /= distance;
-			self.x += dx * 5;
-			self.y += dy * 5;
-		}
-		if (self.intersects(diver)) {
-			LK.effects.flashScreen(0xff0000, 1000);
-			LK.showGameOver();
-		}
-		self.y += self.speed;
-		self.rotation += 0.01;
-		self.scale.x = 1 + Math.sin(LK.ticks / 10) * 0.02;
-		self.scale.y = 1 + Math.sin(LK.ticks / 10) * 0.02;
-		if (self.y < 0) {
-			self.destroy();
-			var index = obstacles.indexOf(self);
-			if (index > -1) {
-				obstacles.splice(index, 1);
-			}
-		}
-		for (var i = 0; i < obstacles.length; i++) {
-			var otherObstacle = obstacles[i];
-			if (self !== otherObstacle && self.intersects(otherObstacle)) {
-				var dx = self.x - otherObstacle.x;
-				var dy = self.y - otherObstacle.y;
-				var distance = Math.sqrt(dx * dx + dy * dy);
-				dx /= distance;
-				dy /= distance;
-				self.x += dx * 10;
-				self.y += dy * 10;
-			}
-		}
-	};
-});
 // Shield class
 var Shield = Container.expand(function () {
 	var self = Container.call(this);
 	var shieldGraphics = self.attachAsset('shield', {
@@ -501,10 +377,14 @@
 		console.error('Error: layoutPositions is undefined. Check the layout variable and the positions object.');
 		return;
 	}
 	for (var i = 0; i < layoutPositions.length; i++) {
-		var obstacleClass = [Obstacle1, Obstacle2, Obstacle3, Obstacle4, Obstacle5][Math.floor(Math.random() * 5)];
-		var obstacle = game.addChild(new obstacleClass());
+		var obstacle;
+		if (currentWave % 2 === 0) {
+			obstacle = game.addChild(new Obstacle1());
+		} else {
+			obstacle = game.addChild(new Obstacle2());
+		}
 		// 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
 		obstacles.push(obstacle);