===================================================================
--- original.js
+++ change.js
@@ -53,9 +53,9 @@
 var BigHeart = Container.expand(function () {
 	var self = Container.call(this);
 	self.currentGraphic = null;
 	self.nextGraphic = null;
-	self.tapLimit = 10; // Initialize tap limit
+	self.tapLimit = 12; // Initialize tap limit
 	self.nbTapsPerFrame = self.tapLimit / 6; // Initialize number of taps per frame
 	self.heartType = 0; // Initialize tap counter
 	self.explosionTriggered = false; // Initialize explosion flag
 	// Attach the bigHeart asset to the class
@@ -78,16 +78,21 @@
 				visible: !i
 			});
 		}
 	}
+	log("Setting frames in constructor...");
 	self.currentGraphic = self.heartFrames[self.heartType][5];
 	self.nextGraphic = self.heartFrames[self.heartType][4];
-	self.currentGraphic.scaleX = 1.1;
-	self.currentGraphic.scaleY = 1.1;
-	self.currentGraphic.visible = true;
-	self.nextGraphic.scaleX = 1.1;
-	self.nextGraphic.scaleY = 1.1;
-	self.nextGraphic.visible = true;
+	if (self.currentGraphic) {
+		self.currentGraphic.scaleX = 1.1;
+		self.currentGraphic.scaleY = 1.1;
+		self.currentGraphic.visible = true;
+	}
+	if (self.nextGraphic) {
+		self.nextGraphic.scaleX = 1.1;
+		self.nextGraphic.scaleY = 1.1;
+		self.nextGraphic.visible = true;
+	}
 	// Position the bigHeart at the center of the screen
 	self.x = 2048 / 2;
 	self.y = 2732 / 2 - 300;
 	// Define baseWidth and baseHeight
@@ -146,39 +151,45 @@
 		}
 	};
 	// Frames Animation
 	self.animateFrames = function () {
-		// Switch graphics based on tapCount
-		var frameIndex = 5 - Math.floor(tapCount / self.nbTapsPerFrame);
-		if (!self.explosionTriggered && tapCount < self.tapLimit * (self.heartType + 1) && frameIndex > 0) {
-			self.currentGraphic = self.heartFrames[self.heartType][frameIndex];
-			self.nextGraphic = self.heartFrames[self.heartType][frameIndex - 1];
-			self.currentGraphic.visible = true;
-			self.nextGraphic.visible = true;
-			tween(self.currentGraphic, {
-				scaleX: 1.1,
-				scaleY: 1.1
-			}, {
-				duration: 300,
-				easing: tween.easeOut
-			});
-			// Make next frame bigger
-			tween(self.nextGraphic, {
-				scaleX: 1.1,
-				scaleY: 1.1
-			}, {
-				duration: 300,
-				easing: tween.easeOut
-			});
+		if (self.explosionTriggered || tapCount >= self.tapLimit * (self.heartType + 1)) {
+			return;
 		}
-		// 10 taps | 5 frames => 10%5 
-		//self.currentGraphic.alpha = Math.max(0, Math.min(1, 1 - ((self.heartType + 1) * self.tapLimit - tapCount) / 10));
-		// Calculate alpha based on progress percentage within current heart level
+		// Calculate progress within current heart level
 		var currentLevelTaps = (self.heartType + 1) * self.tapLimit;
 		var previousLevelTaps = self.heartType * self.tapLimit;
-		var progressInLevel = (tapCount - previousLevelTaps) / (currentLevelTaps - previousLevelTaps);
-		self.nextGraphic.alpha = 1 - Math.max(0, Math.min(1, progressInLevel));
-		log("progressInLevel:", progressInLevel, " => aplha=", self.currentGraphic.alpha);
+		var tapsInCurrentLevel = tapCount - previousLevelTaps;
+		var progressInLevel = tapsInCurrentLevel / (currentLevelTaps - previousLevelTaps);
+		// Calculate which frame we should be showing (0-5)
+		// We have 6 frames (0-5) and we want to progress through them as we get more taps
+		var frameProgress = progressInLevel * 5; // Scale progress to 0-5 range
+		var currentFrameIndex = Math.floor(frameProgress);
+		var nextFrameIndex = Math.min(5, currentFrameIndex + 1);
+		log("Frame progress:", frameProgress, "Current frame:", currentFrameIndex, "Next frame:", nextFrameIndex);
+		// Update current and next graphics
+		if (self.currentGraphic !== self.heartFrames[self.heartType][currentFrameIndex]) {
+			log("Switching to frame", currentFrameIndex);
+			self.currentGraphic = self.heartFrames[self.heartType][currentFrameIndex];
+			self.nextGraphic = self.heartFrames[self.heartType][nextFrameIndex];
+			// Make all frames invisible first
+			self.heartFrames[self.heartType].forEach(function (frame) {
+				frame.visible = false;
+			});
+			// Show only current and next frames
+			self.currentGraphic.visible = true;
+			self.nextGraphic.visible = true;
+			// Reset scales
+			self.currentGraphic.scaleX = 1.1;
+			self.currentGraphic.scaleY = 1.1;
+			self.nextGraphic.scaleX = 1.1;
+			self.nextGraphic.scaleY = 1.1;
+		}
+		// Calculate alpha for smooth transition between frames
+		var alphaProgress = frameProgress - currentFrameIndex; // Gets decimal part
+		self.currentGraphic.alpha = 1 - alphaProgress;
+		self.nextGraphic.alpha = alphaProgress;
+		log("Alpha progress:", alphaProgress, "Current alpha:", self.currentGraphic.alpha, "Next alpha:", self.nextGraphic.alpha);
 	};
 	// Explosion Animation
 	self.animateExplosion = function () {
 		if (!self.explosionTriggered) {
@@ -207,8 +218,9 @@
 							frame.visible = false;
 						});
 						// Switch to the next heart type
 						self.heartType = (self.heartType + 1) % 10;
+						log("Changing frames in animateExplosion...");
 						self.currentGraphic = self.heartFrames[self.heartType][5];
 						self.nextGraphic = self.heartFrames[self.heartType][4];
 						self.currentGraphic.visible = true;
 						self.nextGraphic.visible = true;
@@ -263,9 +275,9 @@
 	// self.x = 2048 / 2;
 	// self.y = 2732 / 2;
 	// Event handler called when a press happens on the button
 	self.down = function (x, y, obj) {
-		console.log("Generator button pressed");
+		log("Generator button pressed");
 		// Check if tapCount is less than the cost of the generator
 		if (tapCount < GENERATORS.ROSE.cost) {
 			log("No enough love");
 			return; // Exit if not enough taps
@@ -585,9 +597,9 @@
 		9: 10000000000
 	};
 	self.lastUpdateTime = self.currentTime;
 	self.updateGame = function () {
-		log("ProgressManager updateGame...");
+		//log("ProgressManager updateGame...");
 		var now = Date.now();
 		var deltaTime = now - self.lastUpdateTime;
 		var tempGenerated = 0;
 		// Update generators
@@ -601,9 +613,9 @@
 			bigHeart.animateBeat();
 		}
 		tapCount = self.money; // Update tapCount to reflect the current money
 		updateTapCountText(); // Update the text display
-		log("Tap count: ", tapCount); // Log the tap count
+		//log("Tap count: ", tapCount); // Log the tap count
 		self.checkProgress(); // Check the progress
 		self.lastUpdateTime = now;
 	};
 	self.manualGeneration = function () {