===================================================================
--- original.js
+++ change.js
@@ -43,9 +43,9 @@
 	self.colliding = false;
 	// This is automatically called every game tick, if the bubble is attached!
 	self.update = function () {
 		// Move the bubble upwards and sideways
-		self.y += self.speed * speedMultiplier;
+		self.y += self.speed;
 		self.x += Math.sin(LK.ticks / 10) * 0.1;
 		// Reset the position of the bubble when it reaches the top
 		if (self.y <= 0) {
 			self.y = 2732;
@@ -144,8 +144,9 @@
 		scaleY: 0.7
 	});
 	// Set obstacle1 speed
 	self.speed = -5;
+	self.originalSpeedY = self.speed; // Store original speed
 	self.originalSpeedX = self.speed;
 	// This is automatically called every game tick, if the obstacle1 is attached!
 	self.update = function () {
 		// Rotate obstacle1 on its axis
@@ -169,9 +170,9 @@
 			self.x += dx * 5;
 			self.y += dy * 5;
 		} else {
 			self.collidingWithShield = false;
-			self.speed = self.originalSpeedY;
+			self.speed = self.originalSpeedX;
 		}
 		// Check for collision with diver
 		if (self.intersects(diver.children.find(function (child) {
 			return child.alpha === 0;
@@ -247,8 +248,9 @@
 		scaleY: 0.7
 	});
 	// Set obstacle2 speed
 	self.speed = -5;
+	self.originalSpeedY = self.speed; // Store original speed
 	self.originalSpeedX = self.speed;
 	// This is automatically called every game tick, if the obstacle2 is attached!
 	self.update = function () {
 		// Check if the obstacle is colliding with the shield
@@ -270,9 +272,9 @@
 			self.x += dx * 5;
 			self.y += dy * 5;
 		} else {
 			self.collidingWithShield = false;
-			self.speed = self.originalSpeedY;
+			self.speed = self.originalSpeedX;
 		}
 		// Check for collision with diver
 		if (self.intersects(diver.children.find(function (child) {
 			return child.alpha === 0;
@@ -349,8 +351,9 @@
 		scaleY: 0.7
 	});
 	// Set obstacle3 speed
 	self.speed = -5;
+	self.originalSpeedY = self.speed; // Store original speed
 	self.originalSpeedX = self.speed;
 	// This is automatically called every game tick, if the obstacle3 is attached!
 	self.update = function () {
 		// Check if the obstacle is colliding with the shield
@@ -372,9 +375,9 @@
 			self.x += dx * 5;
 			self.y += dy * 5;
 		} else {
 			self.collidingWithShield = false;
-			self.speed = self.originalSpeedY;
+			self.speed = self.originalSpeedX;
 		}
 		// Check for collision with diver
 		if (self.intersects(diver.children.find(function (child) {
 			return child.alpha === 0;
@@ -451,8 +454,9 @@
 		scaleY: 0.7
 	});
 	// Set obstacle4 speed
 	self.speed = -5;
+	self.originalSpeedY = self.speed; // Store original speed
 	self.originalSpeedX = self.speed;
 	// This is automatically called every game tick, if the obstacle4 is attached!
 	self.update = function () {
 		// Add up and down movement
@@ -476,9 +480,9 @@
 			self.x += dx * 5;
 			self.y += dy * 5;
 		} else {
 			self.collidingWithShield = false;
-			self.speed = self.originalSpeedY;
+			self.speed = self.originalSpeedX;
 		}
 		// Check for collision with diver
 		if (self.intersects(diver.children.find(function (child) {
 			return child.alpha === 0;
@@ -554,8 +558,9 @@
 		scaleY: 0.7
 	});
 	// Set obstacle5 speed
 	self.speed = -5;
+	self.originalSpeedY = self.speed; // Store original speed
 	self.originalSpeedX = self.speed;
 	// This is automatically called every game tick, if the obstacle5 is attached!
 	self.update = function () {
 		// Add very small sideways movement
@@ -579,9 +584,9 @@
 			self.x += dx * 5;
 			self.y += dy * 5;
 		} else {
 			self.collidingWithShield = false;
-			self.speed = self.originalSpeedY;
+			self.speed = self.originalSpeedX;
 		}
 		// Check for collision with diver
 		if (self.intersects(diver.children.find(function (child) {
 			return child.alpha === 0;
@@ -658,8 +663,9 @@
 		scaleY: 0.7
 	});
 	// Set obstacle6 speed
 	self.speed = -5;
+	self.originalSpeedY = self.speed; // Store original speed
 	self.originalSpeedX = self.speed;
 	// This is automatically called every game tick, if the obstacle6 is attached!
 	self.update = function () {
 		// Flickering effect
@@ -685,9 +691,9 @@
 			self.x += dx * 5;
 			self.y += dy * 5;
 		} else {
 			self.collidingWithShield = false;
-			self.speed = self.originalSpeedY;
+			self.speed = self.originalSpeedX;
 		}
 		// Check for collision with diver
 		if (self.intersects(diver.children.find(function (child) {
 			return child.alpha === 0;
@@ -1046,16 +1052,12 @@
 	console.log('Wave starting position:', wavePositionLabel);
 	console.log('Wave starting position:', wavePositionLabel);
 	layoutPositions.forEach(function (position) {
 		var obstacle = game.addChild(new obstacleType());
+		// Position the obstacles according to the layout, using the grid for positioning
 		obstacle.x = randomStartX + (position.x - gridSize / 2) * cellSize;
 		obstacle.y = 2732 + position.y * cellSize; // Spawn obstacles offscreen at the bottom
-		obstacle.originalSpeedX = obstacle.speed; // Ensure the original speed x is set
-		obstacle.originalSpeedY = obstacle.speed; // Ensure the original speed y is set
 		obstacles.push(obstacle);
-		bubbles.forEach(function (bubble) {
-			bubble.speed = obstacle.speed; // Ensure bubbles' y speed changes the same way obstacles do
-		});
 	});
 	currentWave++;
 	if (currentWave >= obstacleLayouts.length) {
 		allWavesSpawnedOnce = true;