===================================================================
--- original.js
+++ change.js
@@ -905,8 +905,15 @@
 		log("Found start tile at row:", startRow, "col:", startCol);
 		var visited = new SimpleSet();
 		var toCheck = [[startRow, startCol, getFlowDirection(startTile)]];
 		var pathMap = {}; // Store the path for each visited position
+		// Store start position
+		pathMap[startRow + "," + startCol] = {
+			row: startRow,
+			col: startCol,
+			flowDirection: getFlowDirection(startTile),
+			prevKey: null
+		};
 		function getFlowDirection(tile) {
 			var rotation = tile.normalizeRotation(tile.pipeContainer.rotation);
 			switch (tile.type) {
 				case TileFormat.TYPES.START:
@@ -958,13 +965,10 @@
 			}
 			visited.add(key);
 			log("Checking position - row:", row, "col:", col);
 			// Store current position in path map
-			pathMap[key] = {
-				row: row,
-				col: col,
-				flowDirection: flowDirection
-			};
+			//pathMap.set(key, { row, col, flowDirection });
+			// Check if coordinates are within grid
 			if (row < 0 || row >= self.gridSize || col < 0 || col >= self.gridSize) {
 				log("Position out of bounds");
 				continue;
 			}
@@ -1005,20 +1009,34 @@
 						log("Found path to end!");
 						// Reconstruct the solution path
 						self.solutionPath = [];
 						var currentKey = key;
+						// Add the end tile to solution path first
+						self.solutionPath.unshift({
+							row: nextRow,
+							col: nextCol,
+							flowDirection: nextTile.normalizeRotation(nextTile.pipeContainer.rotation),
+							tile: nextTile
+						});
+						// Then add all tiles from end back to start
 						while (currentKey) {
 							var pos = pathMap[currentKey];
 							if (!pos) {
 								break;
 							}
-							self.solutionPath.unshift(pos);
+							self.solutionPath.unshift({
+								row: pos.row,
+								col: pos.col,
+								flowDirection: pos.flowDirection,
+								tile: self.grid[pos.row][pos.col]
+							});
 							currentKey = pos.prevKey;
 						}
+						log("Solution path length:", self.solutionPath.length);
 						return true;
 					}
 					var nextFlowDirection = getFlowDirection(nextTile);
-					var nextKey = "".concat(nextRow, ",").concat(nextCol);
+					var nextKey = nextRow + "," + nextCol;
 					toCheck.push([nextRow, nextCol, nextFlowDirection]);
 					pathMap[nextKey] = {
 						row: nextRow,
 						col: nextCol,
@@ -1135,15 +1153,26 @@
 		if (!self.solutionPath || self.solutionPath.length === 0) {
 			log("No solution path available!");
 			return false;
 		}
+		log("Starting water flow animation with path length:", self.solutionPath.length);
+		// Reset any existing flow states
+		for (var row = 0; row < self.gridSize; row++) {
+			for (var col = 0; col < self.gridSize; col++) {
+				if (self.grid[row][col]) {
+					self.grid[row][col].flow = false;
+				}
+			}
+		}
 		// Start the flow animation by following the stored path
 		for (var i = 0; i < self.solutionPath.length; i++) {
 			var pos = self.solutionPath[i];
-			var tile = self.grid[pos.row][pos.col];
-			if (tile) {
-				tile.flow = true;
+			if (!pos.tile) {
+				log("Warning: No tile found at position:", pos.row, pos.col);
+				continue;
 			}
+			log("Setting flow for tile at:", pos.row, pos.col, "type:", pos.tile.type);
+			pos.tile.flow = true;
 		}
 		return true;
 	};
 	return this;
@@ -1661,6 +1690,5 @@
 	tile.setRotation(tileData.rotation);
 	// Set position
 	tile.updatePosition(row, col);
 	return tile;
-}
-var pathMap = {}; // Store the path for each visited position
\ No newline at end of file
+}
\ No newline at end of file