===================================================================
--- original.js
+++ change.js
@@ -57,19 +57,12 @@
 	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
-	self.heartFrames = Array.from({
-		length: 10
-	}, function () {
-		return Array(6).fill(null);
-	}); // Initialize heartFrames as a 2D array
-	// First initialize all arrays to avoid undefined errors
-	for (var type = 0; type <= 9; type++) {
-		self.heartFrames[type] = new Array(6);
-	}
-	// Then populate the frames in the original order
+	self.heartFrames = {}; // Initialize heartFrames as a property of BigHeart class
+	// Initialize all heart frames first
 	for (var type = 9; type >= 0; type--) {
+		self.heartFrames[type] = [];
 		for (var i = 5; i >= 0; i--) {
 			self.heartFrames[type][5 - i] = self.attachAsset('heart_' + type + '_frame_' + i, {
 				anchorX: 0.5,
 				anchorY: 0.5,
@@ -80,28 +73,24 @@
 				visible: !i
 			});
 		}
 	}
-	log("Setting frames in constructor...");
-	self.currentGraphic = self.heartFrames[self.heartType][5];
-	self.nextGraphic = self.heartFrames[self.heartType][4];
-	if (self.currentGraphic) {
-		if (self.currentGraphic && self.currentGraphic.scaleX !== undefined) {
+	// Ensure frames are initialized before setting graphics
+	if (self.heartFrames[self.heartType] && self.heartFrames[self.heartType][5]) {
+		self.currentGraphic = self.heartFrames[self.heartType][5];
+		self.nextGraphic = self.heartFrames[self.heartType][4];
+		if (self.currentGraphic) {
 			self.currentGraphic.scaleX = 1.1;
-		}
-		if (self.currentGraphic && self.currentGraphic.scaleY !== undefined) {
 			self.currentGraphic.scaleY = 1.1;
+			self.currentGraphic.visible = true;
 		}
-		self.currentGraphic.visible = true;
-	}
-	if (self.nextGraphic) {
-		if (self.nextGraphic.scaleX !== undefined) {
+		if (self.nextGraphic) {
 			self.nextGraphic.scaleX = 1.1;
-		}
-		if (self.nextGraphic.scaleY !== undefined) {
 			self.nextGraphic.scaleY = 1.1;
+			self.nextGraphic.visible = false;
 		}
-		self.nextGraphic.visible = true;
+	} else {
+		log("Warning: Heart frames not properly initialized!");
 	}
 	// Position the bigHeart at the center of the screen
 	self.x = 2048 / 2;
 	self.y = 2732 / 2 - 300;
@@ -182,8 +171,13 @@
 	};
 	self.updateFramesByProgress = function (progress) {
 		log("=== updateFramesByProgress ===");
 		log("Raw progress:", progress);
+		// Safety check for heart frames
+		if (!self.heartFrames[self.heartType]) {
+			log("Error: Heart frames not initialized for type", self.heartType);
+			return;
+		}
 		// Progress is already tap count / tapsPerLevel, so we need to scale it to frames
 		// Each frame gets 20% of progress (0.2 per frame)
 		var frameProgress = progress * 5; // Convert progress to frame scale (0-5)
 		log("Progress calculations:");
@@ -192,15 +186,17 @@
 		self.heartFrames[self.heartType].forEach(function (frame) {
 			if (frame && frame._activeTween) {
 				frame._activeTween.stop();
 			}
-			frame.visible = false;
+			if (frame) {
+				frame.visible = false;
+			}
 		});
 		// Handle the final frame (0) separately - only shown after explosion
 		if (progress >= 1) {
 			log("Progress >= 1, showing frame 0");
-			self.currentGraphic = self.heartFrames[self.heartType][0];
-			if (self.currentGraphic) {
+			if (self.heartFrames[self.heartType][0]) {
+				self.currentGraphic = self.heartFrames[self.heartType][0];
 				self.currentGraphic.visible = true;
 				self.currentGraphic.scaleX = self.currentGraphic.scaleY = 1.1;
 				self.currentGraphic.alpha = 1;
 				log("Frame 0 set to visible with alpha:", self.currentGraphic.alpha);
@@ -215,19 +211,15 @@
 		log("- heartType:", self.heartType);
 		log("- currentFrameIndex:", currentFrameIndex);
 		log("- alpha:", alpha);
 		// Show next frame first (it will be behind current frame)
-		if (currentFrameIndex > 1) {
+		if (currentFrameIndex > 1 && self.heartFrames[self.heartType][currentFrameIndex - 1]) {
 			// Only show next frame if we're not on frame 1
 			self.nextGraphic = self.heartFrames[self.heartType][currentFrameIndex - 1];
 			if (self.nextGraphic) {
 				self.nextGraphic.visible = true;
 				self.nextGraphic.alpha = 1; // Keep next frame fully visible
 				self.nextGraphic.scaleX = self.nextGraphic.scaleY = 1.1;
-				// Ensure nextGraphic is behind currentGraphic
-				if (self.nextGraphic.parent) {
-					//self.nextGraphic.parent.setChildIndex(self.nextGraphic, 0);
-				}
 				log("Next frame setup:");
 				log("- heartType:", self.nextGraphic.heartType);
 				log("- index:", currentFrameIndex - 1);
 				log("- visible:", self.nextGraphic.visible);
@@ -238,17 +230,13 @@
 			log("No next frame (currentFrameIndex <= 1)");
 			self.nextGraphic = null;
 		}
 		// Show current frame on top
-		self.currentGraphic = self.heartFrames[self.heartType][currentFrameIndex];
-		if (self.currentGraphic) {
+		if (self.heartFrames[self.heartType][currentFrameIndex]) {
+			self.currentGraphic = self.heartFrames[self.heartType][currentFrameIndex];
 			self.currentGraphic.visible = true;
 			self.currentGraphic.alpha = alpha; // Only fade out current frame
 			self.currentGraphic.scaleX = self.currentGraphic.scaleY = 1.1;
-			// Ensure currentGraphic is above nextGraphic
-			if (self.currentGraphic.parent) {
-				//self.currentGraphic.parent.setChildIndex(self.currentGraphic, self.currentGraphic.parent.children.length - 1);
-			}
 			log("Current frame setup:");
 			log("- heartType:", self.currentGraphic.heartType);
 			log("- index:", currentFrameIndex);
 			log("- visible:", self.currentGraphic.visible);