===================================================================
--- original.js
+++ change.js
@@ -207,8 +207,29 @@
 		return null;
 	};
 	// Method to calculate path of movement based on angle and starting point
 	//TODO: MAKE THIS MUCH FASTER!
+	self.bubbleIntersectsGrid = function (nextX, nextY) {
+		outer: for (var row = 0; row < rows.length; row++) {
+			for (var col = 0; col < rows[row].length; col++) {
+				var bubble = rows[row][col];
+				if (bubble) {
+					var dist = nextY - bubble.y - self.y;
+					//Quick exit if we are nowhere near the row
+					if (dist > 145 || dist < -145) {
+						continue outer;
+					}
+					var dx = nextX - bubble.x - self.x;
+					var dy = nextY - bubble.y - self.y;
+					var distance = Math.sqrt(dx * dx + dy * dy);
+					if (distance < 70 + bubble.width / 2) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	};
 	self.calculatePath = function (startPoint, angle) {
 		var path = [];
 		var currentPoint = {
 			x: startPoint.x,
@@ -225,31 +246,9 @@
 			if (nextX < 150 / 2 || nextX > 2048 - 150 / 2) {
 				radians = Math.PI - radians; // Reflect angle
 				nextX = currentPoint.x + stepSize * Math.cos(radians); // Recalculate nextX after reflection
 			}
-			// Check for bubble collisions
-			outer: for (var row = 0; row < rows.length; row++) {
-				for (var col = 0; col < rows[row].length; col++) {
-					var bubble = rows[row][col];
-					if (bubble) {
-						var dist = nextY - bubble.y - self.y;
-						//Quick exit if we are nowhere near the row
-						if (dist > 145 || dist < -145) {
-							continue outer;
-						}
-						var dx = nextX - bubble.x - self.x;
-						var dy = nextY - bubble.y - self.y;
-						var distance = Math.sqrt(dx * dx + dy * dy);
-						if (distance < 70 + bubble.width / 2) {
-							hitBubble = true;
-							break;
-						}
-					}
-				}
-				if (hitBubble) {
-					break;
-				}
-			}
+			hitBubble = self.bubbleIntersectsGrid(nextX, nextY);
 			// Add point to path and update currentPoint
 			path.push({
 				x: nextX,
 				y: nextY
@@ -264,16 +263,48 @@
 		self.addChild(bubble);
 		bubble.x = launcher.x;
 		bubble.y += launcher.y - self.y;
 		bubblesInFlight.push({
-			bubble: bubblesInFlight,
+			bubble: bubble,
 			angle: angle
 		});
 	};
 	self.update = function () {
 		for (var a = 0; a < bubblesInFlight.length; a++) {
-			var currentBubble = bubblesInFlight[a];
-			currentBubble.bubble.x++;
+			var current = bubblesInFlight[a];
+			var bubble = current.bubble;
+			var nextX = bubble.x + Math.cos(current.angle) * 20;
+			var nextY = bubble.y + Math.sin(current.angle) * 20;
+			if (nextX < 150 / 2 || nextY > 2048 - 150 / 2) {
+				current.angle = Math.PI - current.angle; // Reflect angle
+				//				bubble.x = currentPoint.x + stepSize * Math.cos(radians); // Recalculate nextX after reflection
+			}
+			if (self.bubbleIntersectsGrid(nextX + self.x, nextY + self.y)) {
+				var closestRow = Math.round((nextY - self.y) / (1.7320508076 * bubble.width / 2));
+				var rowWidth = closestRow % 2 == 0 ? 13 : 12;
+				var closestCol = Math.round((nextX - self.x - (2048 - bubble.width * rowWidth) / 2) / bubble.width);
+				// Adjust for even/odd rows
+				if (closestRow % 2 == 0 && closestCol >= rowWidth) {
+					closestCol = rowWidth - 1;
+				} else if (closestRow % 2 != 0 && closestCol > rowWidth) {
+					closestCol = rowWidth;
+				}
+				// Ensure the column is within bounds
+				closestCol = Math.max(0, Math.min(closestCol, rowWidth - 1));
+				// Calculate the exact position
+				bubble.x = (2048 - bubble.width * rowWidth) / 2 + bubble.width * closestCol + bubble.width / 2 + self.x;
+				bubble.y = closestRow * (1.7320508076 * bubble.width / 2) + self.y;
+				// Attach the bubble to the grid
+				if (!rows[closestRow]) {
+					rows[closestRow] = [];
+				}
+				rows[closestRow][closestCol] = bubble;
+				bubble.isAttached = true;
+				bubblesInFlight.splice(a, 1); // Remove the bubble from bubblesInFlight array
+			} else {
+				bubble.x = nextX;
+				bubble.y = nextY;
+			}
 		}
 	};
 	insertRow();
 	insertRow();