===================================================================
--- original.js
+++ change.js
@@ -354,10 +354,13 @@
 	// Position the button at the center of the screen
 	// self.x = 2048 / 2;
 	// self.y = 2732 / 2;
 	// Event handler called when a press happens on the button
+	var isSwipingButtons = false; // Global flag to track swipe/animation state
+	var dragNode = null;
+	var globalStartY = 0;
 	self.down = function (x, y, obj) {
-		if (self.isAnimating) {
+		if (isSwipingButtons) {
 			return;
 		} // Prevent interaction during animation
 		log("Generator button pressed", y);
 		globalStartY = y;
@@ -365,11 +368,11 @@
 		self.startTime = Date.now();
 		self.startX = x;
 	};
 	self.up = function (x, y, obj) {
-		if (self.isAnimating) {
+		if (isSwipingButtons) {
 			dragNode = null;
-			return; // Prevent interaction during animation
+			return;
 		}
 		var endTime = Date.now();
 		var timeDiff = endTime - self.startTime;
 		var distance = Math.sqrt(Math.pow(x - self.startX, 2) + Math.pow(y - globalStartY, 2));
@@ -382,38 +385,44 @@
 				LK.getSound('cantBuyGenerator').play(); // Play sound when player can't buy
 				// Store original position
 				var originalX = self.x;
 				var originalY = self.y;
-				self.isAnimating = true;
+				isSwipingButtons = true;
+				dragNode = null; // Reset dragNode immediately when starting animation
 				tween(self, {
 					x: originalX + 10,
 					y: originalY + 10
 				}, {
 					duration: 100,
 					easing: tween.easeInOut,
 					onFinish: function onFinish() {
+						if (!isSwipingButtons) {
+							return;
+						} // Prevent animation continuation if interrupted
 						tween(self, {
 							x: originalX - 10,
 							y: originalY - 10
 						}, {
 							duration: 100,
 							easing: tween.easeInOut,
 							onFinish: function onFinish() {
+								if (!isSwipingButtons) {
+									return;
+								}
 								tween(self, {
 									x: originalX,
 									y: originalY
 								}, {
 									duration: 100,
 									easing: tween.easeInOut,
 									onFinish: function onFinish() {
-										self.isAnimating = false;
+										isSwipingButtons = false;
 									}
 								});
 							}
 						});
 					}
 				});
-				dragNode = null; // Reset dragNode immediately when starting animation
 				return; // Exit if not enough taps
 			}
 			// Buy the corresponding generator using progressManager
 			if (progressManager.buyGenerator(self.index)) {
@@ -442,9 +451,9 @@
 				log("Failed to purchase generator");
 			}
 		} else {
 			// Only handle swipe if not animating
-			if (!isAnimating && dragNode === rightBoard) {
+			if (!isSwipingButtons && dragNode === rightBoard) {
 				log("Detected swipe on Generator button");
 				rightBoard.handleSwipe(y - globalStartY);
 			}
 			dragNode = null; // Reset dragNode when mouse is up
@@ -620,10 +629,12 @@
 		if (isAnyButtonAnimating) {
 			return; // Prevent movement if any button is animating
 		}
 		if (dragNode === self || dragNode instanceof GeneratorButton) {
-			var deltaY = y - globalStartY;
-			// Calculate new positions for boundaries
+			// Check if a button or rightBoard is being dragged
+			var deltaY = y - globalStartY; // Calculate deltaY based on movement
+			log("Move detected with deltaY:", deltaY);
+			// Calculate new positions for the first and last buttons
 			var firstButtonNewY = self.y + self.generatorButtons[0].y + deltaY;
 			var lastButtonNewY = self.y + self.generatorButtons[self.generatorButtons.length - 1].y + deltaY;
 			log("firstButtonNewY:", firstButtonNewY, "lastButtonNewY:", lastButtonNewY);
 			// Adjust deltaY to prevent moving beyond boundaries
@@ -636,9 +647,9 @@
 			// Move all generator buttons vertically based on swipe direction
 			self.generatorButtons.forEach(function (button) {
 				button.y += deltaY;
 			});
-			globalStartY = y;
+			globalStartY = y; // Update globalStartY for continuous movement
 		}
 	};
 	self.up = function (x, y, obj) {
 		var endTime = Date.now();
@@ -681,9 +692,8 @@
 			// Calculate new positions for the first and last buttons
 			var firstButtonNewY = self.y + self.generatorButtons[0].y + deltaY;
 			var lastButtonNewY = self.y + self.generatorButtons[self.generatorButtons.length - 1].y + deltaY;
 			log("firstButtonNewY:", firstButtonNewY, "lastButtonNewY:", lastButtonNewY);
-			// Check if the first button stays above the screen center and the last button stays below the screen center
 			// Adjust deltaY to prevent moving beyond boundaries
 			if (deltaY > 0) {
 				deltaY = Math.min(deltaY, 1000 - (self.y + self.generatorButtons[0].y));
 			}
@@ -712,10 +722,9 @@
 // Declare a global variable to store the startY position for GeneratorButton events
 var globalStartY = 0;
 // Declare a global variable to track the node being dragged
 var dragNode = null;
-// Declare a global variable to track animation state
-var isAnimating = false;
+var isSwipingButtons = false; // Global flag to track swipe/animation state
 // Global event listener for mouse or touch up
 game.up = function (x, y, obj) {
 	dragNode = null; // Reset dragNode when mouse is up
 };