===================================================================
--- original.js
+++ change.js
@@ -11,37 +11,41 @@
 	var self = Container.call(this);
 	self.buttonText = '';
 	self.onClick = function () {};
 	self.isHovered = false;
+	self.hitWidth = 280;
+	self.hitHeight = 60;
 	var bg = self.attachAsset('buttonBg', {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
 	var text = new Text2('', {
-		size: 24,
-		fill: '#ffffff'
+		size: 22,
+		fill: '#ffffff',
+		align: 'center'
 	});
 	text.anchor.set(0.5, 0.5);
 	self.addChild(text);
 	self.setText = function (str) {
 		self.buttonText = str;
 		text.setText(str);
 	};
-	self.down = function () {
-		LK.getSound('buttonClickSound').play();
-		self.onClick();
+	self.setEnabled = function (enabled) {
+		self.enabled = enabled;
+		self.alpha = enabled ? 1 : 0.45;
 	};
-	self.move = function (x, y, obj) {
-		var globalPos = obj.parent.toGlobal(obj.position);
-		var isInside = globalPos.x > -140 && globalPos.x < 140 && globalPos.y > -30 && globalPos.y < 30;
-		if (isInside && !self.isHovered) {
-			self.isHovered = true;
-			bg.tint = 0x15537a;
-		} else if (!isInside && self.isHovered) {
-			self.isHovered = false;
-			bg.tint = 0x0f3460;
-		}
+	self.setHovered = function (hovered) {
+		self.isHovered = hovered;
+		bg.tint = hovered ? 0x15537a : 0x0f3460;
 	};
+	self.containsPoint = function (x, y) {
+		return pointInRect(x, y, self.x, self.y, self.hitWidth, self.hitHeight);
+	};
+	self.press = function () {
+		if (self.enabled === false) return;
+		safePlaySound('buttonClickSound');
+		self.onClick();
+	};
 	return self;
 });
 var DustParticle = Container.expand(function () {
 	var self = Container.call(this);
@@ -51,51 +55,61 @@
 	});
 	dust.alpha = 0.8;
 	self.velocityX = (Math.random() - 0.5) * 4;
 	self.velocityY = (Math.random() - 0.5) * 4;
-	self.gravity = 0.1;
-	self.life = 0.5;
-	self.maxLife = 0.5;
+	self.gravity = 0.08;
+	self.life = 0.4;
+	self.maxLife = 0.4;
 	self.update = function () {
 		self.velocityY += self.gravity;
 		self.x += self.velocityX;
 		self.y += self.velocityY;
 		self.life -= 1 / 60;
 		dust.alpha = 0.8 * (self.life / self.maxLife);
 		if (self.life <= 0) {
+			if (self.parent) self.parent.removeChild(self);
 			self.destroy();
 		}
 	};
 	return self;
 });
-var ScratchTicket = Container.expand(function () {
+var ScratchTicket = Container.expand(function (ticketType) {
 	var self = Container.call(this);
-	self.ticketType = 0; // 0=Basic, 1=Lucky, 2=Gold
+	self.ticketType = ticketType || 0;
 	self.symbols = [];
-	self.scratched = false;
 	self.scratchAmount = 0;
-	self.revealThreshold = 0.5;
-	self.matchResult = null;
+	self.resolved = false;
+	self.canScratch = true;
+	self.autoResolveThreshold = 0.55 - gameState.upgrades[2] * 0.03;
+	self.autoResolveThreshold = clamp(self.autoResolveThreshold, 0.25, 0.55);
+	self.ticketWidth = 600;
+	self.ticketHeight = 800;
 	var bg = self.attachAsset('ticketBg', {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
-	bg.tint = 0x2a2a4e;
-	// Set ticket color based on type
-	if (self.ticketType === 1) bg.tint = 0x1a3a2e;else if (self.ticketType === 2) bg.tint = 0x3a2e1a;
+	bg.tint = getTicketTint(self.ticketType);
 	var overlay = self.attachAsset('scratchOverlay', {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
-	overlay.alpha = 0.95;
-	var titleText = new Text2('SCRATCH TICKET', {
-		size: 30,
-		fill: '#ffffff'
+	overlay.alpha = 0.96;
+	var titleText = new Text2(getTicketName(self.ticketType), {
+		size: 28,
+		fill: '#ffffff',
+		align: 'center'
 	});
 	titleText.anchor.set(0.5, 0);
 	titleText.y = -350;
 	self.addChild(titleText);
-	// Create 3x3 grid of symbols
+	var infoText = new Text2('Scratch to reveal 3 matching symbols', {
+		size: 16,
+		fill: '#ffd700',
+		align: 'center'
+	});
+	infoText.anchor.set(0.5, 0);
+	infoText.y = -310;
+	self.addChild(infoText);
 	var gridStartX = -140;
 	var gridStartY = -140;
 	var spacing = 160;
 	for (var row = 0; row < 3; row++) {
@@ -106,41 +120,75 @@
 			self.symbols.push(symbol);
 			self.addChild(symbol);
 		}
 	}
+	self.containsGlobalPoint = function (x, y) {
+		return pointInRect(x, y, self.x, self.y, self.ticketWidth, self.ticketHeight);
+	};
 	self.updateScratch = function (amount) {
-		self.scratchAmount += amount;
-		if (self.scratchAmount > 1) self.scratchAmount = 1;
-		overlay.alpha = Math.max(0, 1 - self.scratchAmount);
-		// Reveal symbols as scratch increases
+		if (!self.canScratch || self.resolved) return;
+		self.scratchAmount = clamp(self.scratchAmount + amount, 0, 1);
+		overlay.alpha = clamp(0.96 - self.scratchAmount, 0, 0.96);
+		var revealTarget = Math.floor(self.scratchAmount * self.symbols.length);
+		var alreadyRevealed = 0;
 		for (var i = 0; i < self.symbols.length; i++) {
-			if (Math.random() < self.scratchAmount * 0.3) {
-				self.symbols[i].reveal();
+			if (self.symbols[i].revealed) alreadyRevealed++;
+		}
+		while (alreadyRevealed < revealTarget) {
+			var hidden = [];
+			for (var j = 0; j < self.symbols.length; j++) {
+				if (!self.symbols[j].revealed) hidden.push(self.symbols[j]);
 			}
+			if (hidden.length <= 0) break;
+			var pick = hidden[Math.floor(Math.random() * hidden.length)];
+			pick.reveal();
+			alreadyRevealed++;
 		}
+		if (self.scratchAmount >= self.autoResolveThreshold) {
+			self.resolveTicket();
+		}
 	};
 	self.checkMatch = function () {
 		var counts = {};
 		for (var i = 0; i < self.symbols.length; i++) {
 			var type = self.symbols[i].symbolType;
 			counts[type] = (counts[type] || 0) + 1;
 		}
+		var bestType = null;
+		var bestCount = 0;
 		for (var key in counts) {
-			if (counts[key] >= 3) {
-				self.matchResult = {
-					type: key,
-					count: counts[key]
-				};
-				return true;
+			if (counts[key] > bestCount) {
+				bestType = key;
+				bestCount = counts[key];
 			}
 		}
-		return false;
+		if (bestCount >= 3) {
+			return {
+				win: true,
+				type: bestType,
+				count: bestCount
+			};
+		}
+		return {
+			win: false,
+			type: bestType,
+			count: bestCount
+		};
 	};
-	self.update = function () {
-		if (self.scratchAmount >= self.revealThreshold && !self.scratched) {
-			self.scratched = true;
+	self.revealAll = function () {
+		for (var i = 0; i < self.symbols.length; i++) {
+			self.symbols[i].reveal();
 		}
+		overlay.alpha = 0;
 	};
+	self.resolveTicket = function () {
+		if (self.resolved) return;
+		self.resolved = true;
+		self.canScratch = false;
+		self.revealAll();
+		var result = self.checkMatch();
+		resolveCurrentTicket(result);
+	};
 	return self;
 });
 var UpgradeCard = Container.expand(function () {
 	var self = Container.call(this);
@@ -148,50 +196,53 @@
 	self.level = 0;
 	self.cost = 0;
 	self.onClick = function () {};
 	self.isHovered = false;
+	self.hitWidth = 280;
+	self.hitHeight = 42;
 	var bg = self.attachAsset('buttonBg', {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
 	bg.scaleY = 0.7;
 	var nameText = new Text2('', {
 		size: 16,
-		fill: '#ffffff'
+		fill: '#ffffff',
+		align: 'center'
 	});
 	nameText.anchor.set(0.5, 0);
 	nameText.y = -15;
 	self.addChild(nameText);
 	var costText = new Text2('', {
 		size: 14,
-		fill: '#ffd700'
+		fill: '#ffd700',
+		align: 'center'
 	});
 	costText.anchor.set(0.5, 0);
 	costText.y = 5;
 	self.addChild(costText);
-	self.setUpgrade = function (id, level, cost) {
+	self.setUpgrade = function (id, level, cost, affordable) {
 		self.upgradeId = id;
 		self.level = level;
 		self.cost = cost;
 		var names = ['Better Odds', 'Bigger Payouts', 'Faster Scratch', 'Combo Boost', 'Jackpot Gain', 'Coin Magnet'];
 		nameText.setText(names[id] + ' Lv' + (level + 1));
-		costText.setText('Cost: $' + cost);
+		costText.setText('Cost: ' + formatMoney(cost));
+		self.alpha = affordable ? 1 : 0.55;
 	};
-	self.down = function () {
-		LK.getSound('buttonClickSound').play();
-		self.onClick();
+	self.setHovered = function (hovered) {
+		self.isHovered = hovered;
+		bg.tint = hovered ? 0x15537a : 0x0f3460;
 	};
-	self.move = function (x, y, obj) {
-		var globalPos = obj.parent.toGlobal(obj.position);
-		var isInside = globalPos.x > -140 && globalPos.x < 140 && globalPos.y > -21 && globalPos.y < 21;
-		if (isInside && !self.isHovered) {
-			self.isHovered = true;
-			bg.tint = 0x15537a;
-		} else if (!isInside && self.isHovered) {
-			self.isHovered = false;
-			bg.tint = 0x0f3460;
-		}
+	self.containsGlobalPoint = function (x, y) {
+		var gx = rightPanel.x + self.x;
+		var gy = rightPanel.y + self.y;
+		return pointInRect(x, y, gx, gy, self.hitWidth, self.hitHeight);
 	};
+	self.press = function () {
+		safePlaySound('buttonClickSound');
+		self.onClick();
+	};
 	return self;
 });
 var _Symbol = Container.expand(function () {
 	var self = Container.call(this);
@@ -201,24 +252,26 @@
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
 	var symbolText = new Text2('', {
-		size: 60,
-		fill: '#ffffff'
+		size: 56,
+		fill: '#ffffff',
+		align: 'center'
 	});
 	symbolText.anchor.set(0.5, 0.5);
+	symbolText.alpha = 0.25;
 	self.addChild(symbolText);
 	self.setSymbol = function (type) {
 		self.symbolType = type;
 		var symbols = ['🍀', '💎', '🎁', '⭐', '🔥', '🎰'];
 		symbolText.setText(symbols[type % symbols.length]);
 	};
 	self.reveal = function () {
-		if (!self.revealed) {
-			self.revealed = true;
-			bg.tint = 0x4a4a6a;
-			LK.getSound('revealSound').play();
-		}
+		if (self.revealed) return;
+		self.revealed = true;
+		bg.tint = 0x4a4a6a;
+		symbolText.alpha = 1;
+		safePlaySound('revealSound');
 	};
 	self.setSymbol(Math.floor(Math.random() * 6));
 	return self;
 });
@@ -232,41 +285,92 @@
 
 /**** 
 * Game Code
 ****/ 
-// Music
-// Sounds for feedback
-// Shapes for UI panels and game elements
-// Game state
+/**** 
+* Helpers
+****/ 
+/**** 
+* Game State
+****/ 
+function clamp(value, min, max) {
+	return Math.max(min, Math.min(max, value));
+}
+function safePlaySound(name) {
+	try {
+		var s = LK.getSound(name);
+		if (s && s.play) s.play();
+	} catch (e) {}
+}
+function safePlayMusic(name, options) {
+	try {
+		LK.playMusic(name, options || {});
+	} catch (e) {}
+}
+function formatMoney(value) {
+	return '$' + Math.floor(value);
+}
+function pointInRect(px, py, cx, cy, width, height) {
+	return px >= cx - width * 0.5 && px <= cx + width * 0.5 && py >= cy - height * 0.5 && py <= cy + height * 0.5;
+}
+function getTicketCost(type) {
+	var costs = [5, 15, 50];
+	return costs[type] || 5;
+}
+function getUpgradeCost(id, level) {
+	var baseCosts = [50, 75, 60, 80, 100, 70];
+	return Math.floor(baseCosts[id] * Math.pow(1.3, level));
+}
+function getTicketName(type) {
+	if (type === 1) return 'LUCKY TICKET';
+	if (type === 2) return 'GOLD TICKET';
+	return 'BASIC TICKET';
+}
+function getTicketTint(type) {
+	if (type === 1) return 0x1a3a2e;
+	if (type === 2) return 0x3a2e1a;
+	return 0x2a2a4e;
+}
+if (!storage.coins && storage.coins !== 0) storage.coins = 100;
+if (!storage.totalCoins && storage.totalCoins !== 0) storage.totalCoins = 100;
+if (!storage.bestStreak && storage.bestStreak !== 0) storage.bestStreak = 0;
+if (!storage.jackpotMeter && storage.jackpotMeter !== 0) storage.jackpotMeter = 0;
+if (!storage.ticketsScratchedTotal && storage.ticketsScratchedTotal !== 0) storage.ticketsScratchedTotal = 0;
+if (!storage.biggestWin && storage.biggestWin !== 0) storage.biggestWin = 0;
+if (!storage.jackpotsHit && storage.jackpotsHit !== 0) storage.jackpotsHit = 0;
+if (!storage.prestigeCount && storage.prestigeCount !== 0) storage.prestigeCount = 0;
+if (!storage.prestigeChips && storage.prestigeChips !== 0) storage.prestigeChips = 0;
+if (!storage.upgrades) storage.upgrades = [0, 0, 0, 0, 0, 0];
 var gameState = {
-	coins: storage.coins || 100,
-	totalCoins: storage.totalCoins || 100,
+	coins: storage.coins,
+	totalCoins: storage.totalCoins,
 	streak: 0,
-	bestStreak: storage.bestStreak || 0,
-	jackpotMeter: storage.jackpotMeter || 0,
+	bestStreak: storage.bestStreak,
+	jackpotMeter: storage.jackpotMeter,
 	jackpotMax: 100,
-	ticketsScratchedTotal: storage.ticketsScratchedTotal || 0,
-	biggestWin: storage.biggestWin || 0,
-	jackpotsHit: storage.jackpotsHit || 0,
-	prestigeCount: storage.prestigeCount || 0,
-	prestigeChips: storage.prestigeChips || 0,
-	upgrades: storage.upgrades || [0, 0, 0, 0, 0, 0]
+	ticketsScratchedTotal: storage.ticketsScratchedTotal,
+	biggestWin: storage.biggestWin,
+	jackpotsHit: storage.jackpotsHit,
+	prestigeCount: storage.prestigeCount,
+	prestigeChips: storage.prestigeChips,
+	upgrades: storage.upgrades
 };
 var currentTicket = null;
 var dragData = {
 	active: false,
-	startX: 0,
-	startY: 0
+	lastX: 0,
+	lastY: 0
 };
 var dustParticles = [];
-var coins = [];
-// UI Elements
+var popupTexts = [];
 var leftPanel, rightPanel, bottomPanel;
-var coinText, streakText, jackpotBar, jackpotText;
+var coinText, streakText, jackpotBar, jackpotText, statsText;
 var ticketBuyButtons = [];
 var upgradeCards = [];
+/**** 
+* UI
+****/ 
 function initUI() {
-	// Left sidebar
 	leftPanel = new Container();
 	leftPanel.x = 100;
 	leftPanel.y = 100;
 	game.addChild(leftPanel);
@@ -338,9 +442,17 @@
 	jackpotText.anchor.set(0.5, 0);
 	jackpotText.x = 150;
 	jackpotText.y = 300;
 	leftPanel.addChild(jackpotText);
-	// Right sidebar - upgrades
+	statsText = new Text2('', {
+		size: 12,
+		fill: '#bbbbbb',
+		align: 'center'
+	});
+	statsText.anchor.set(0.5, 0);
+	statsText.x = 150;
+	statsText.y = 350;
+	leftPanel.addChild(statsText);
 	rightPanel = new Container();
 	rightPanel.x = 1848;
 	rightPanel.y = 100;
 	game.addChild(rightPanel);
@@ -359,20 +471,19 @@
 	shopLabelText.y = 20;
 	rightPanel.addChild(shopLabelText);
 	for (var i = 0; i < 6; i++) {
 		var card = new UpgradeCard();
-		card.y = 80 + i * 90;
+		card.y = 90 + i * 82;
 		card.x = -150;
 		card.onClick = function () {
 			onUpgradeClick(this.upgradeId);
 		}.bind(card);
 		upgradeCards.push(card);
 		rightPanel.addChild(card);
 	}
-	// Bottom panel - ticket buy buttons
 	bottomPanel = new Container();
 	bottomPanel.x = 1024;
-	bottomPanel.y = 2620;
+	bottomPanel.y = 2520;
 	game.addChild(bottomPanel);
 	var ticketTypes = [{
 		name: 'Basic\n$5',
 		cost: 5,
@@ -385,22 +496,21 @@
 		name: 'Gold\n$50',
 		cost: 50,
 		type: 2
 	}];
-	for (var i = 0; i < 3; i++) {
+	for (var t = 0; t < ticketTypes.length; t++) {
 		var btn = new Button();
-		btn.x = -300 + i * 300;
+		btn.x = -300 + t * 300;
 		btn.y = 0;
-		btn.setText(ticketTypes[i].name);
-		btn.cost = ticketTypes[i].cost;
-		btn.type = ticketTypes[i].type;
+		btn.setText(ticketTypes[t].name);
+		btn.cost = ticketTypes[t].cost;
+		btn.type = ticketTypes[t].type;
 		btn.onClick = function () {
 			onBuyTicket(this.type, this.cost);
 		}.bind(btn);
 		ticketBuyButtons.push(btn);
 		bottomPanel.addChild(btn);
 	}
-	// Top title
 	var titleText = new Text2('LUCKY SCRATCH TYCOON', {
 		size: 40,
 		fill: '#ffd700'
 	});
@@ -408,177 +518,213 @@
 	titleText.x = 1024;
 	titleText.y = 30;
 	game.addChild(titleText);
 }
+function updateUI() {
+	if (coinText) coinText.setText(formatMoney(gameState.coins));
+	if (streakText) streakText.setText('x' + gameState.streak);
+	if (jackpotBar) {
+		jackpotBar.scaleX = clamp(gameState.jackpotMeter / gameState.jackpotMax, 0, 1);
+	}
+	if (jackpotText) {
+		jackpotText.setText(gameState.jackpotMeter + '/' + gameState.jackpotMax);
+	}
+	if (statsText) {
+		statsText.setText('Best Streak: ' + gameState.bestStreak + '\nBiggest Win: ' + formatMoney(gameState.biggestWin) + '\nTickets: ' + gameState.ticketsScratchedTotal);
+	}
+	for (var i = 0; i < upgradeCards.length; i++) {
+		var level = gameState.upgrades[i];
+		var cost = getUpgradeCost(i, level);
+		upgradeCards[i].setUpgrade(i, level, cost, gameState.coins >= cost);
+	}
+	for (var j = 0; j < ticketBuyButtons.length; j++) {
+		ticketBuyButtons[j].setEnabled(gameState.coins >= ticketBuyButtons[j].cost);
+	}
+}
+function saveProgress() {
+	storage.coins = gameState.coins;
+	storage.totalCoins = gameState.totalCoins;
+	storage.bestStreak = gameState.bestStreak;
+	storage.jackpotMeter = gameState.jackpotMeter;
+	storage.ticketsScratchedTotal = gameState.ticketsScratchedTotal;
+	storage.biggestWin = gameState.biggestWin;
+	storage.jackpotsHit = gameState.jackpotsHit;
+	storage.prestigeCount = gameState.prestigeCount;
+	storage.prestigeChips = gameState.prestigeChips;
+	storage.upgrades = gameState.upgrades;
+}
+/**** 
+* Gameplay
+****/ 
 function createNewTicket(ticketType) {
 	if (currentTicket) {
-		game.removeChild(currentTicket);
+		if (currentTicket.parent) currentTicket.parent.removeChild(currentTicket);
 		currentTicket.destroy();
 	}
-	currentTicket = new ScratchTicket();
-	currentTicket.ticketType = ticketType;
+	currentTicket = new ScratchTicket(ticketType);
 	currentTicket.x = 1024;
 	currentTicket.y = 1200;
 	game.addChild(currentTicket);
 	dragData.active = false;
 }
 function onBuyTicket(type, cost) {
-	if (gameState.coins >= cost) {
-		gameState.coins -= cost;
-		createNewTicket(type);
-		gameState.ticketsScratchedTotal++;
-	}
+	if (currentTicket && !currentTicket.resolved) return;
+	if (gameState.coins < cost) return;
+	gameState.coins -= cost;
+	gameState.ticketsScratchedTotal++;
+	createNewTicket(type);
+	updateUI();
+	saveProgress();
 }
 function onUpgradeClick(upgradeId) {
-	var baseCosts = [50, 75, 60, 80, 100, 70];
 	var level = gameState.upgrades[upgradeId];
-	var cost = Math.floor(baseCosts[upgradeId] * Math.pow(1.3, level));
-	if (gameState.coins >= cost) {
-		gameState.coins -= cost;
-		gameState.upgrades[upgradeId]++;
-		LK.getSound('upgradeSound').play();
-		updateUI();
-	}
+	var cost = getUpgradeCost(upgradeId, level);
+	if (gameState.coins < cost) return;
+	gameState.coins -= cost;
+	gameState.upgrades[upgradeId]++;
+	safePlaySound('upgradeSound');
+	updateUI();
+	saveProgress();
 }
-function createCoinPopup(x, y, amount) {
-	var text = new Text2('+$' + amount, {
+function createPopupText(x, y, textValue, color) {
+	var text = new Text2(textValue, {
 		size: 32,
-		fill: '#ffd700'
+		fill: color || '#ffd700',
+		align: 'center'
 	});
 	text.anchor.set(0.5, 0.5);
 	text.x = x;
 	text.y = y;
 	game.addChild(text);
-	coins.push(text);
+	popupTexts.push(text);
 	tween(text, {
-		y: y - 100,
+		y: y - 90,
 		alpha: 0
 	}, {
-		duration: 800,
+		duration: 700,
 		easing: tween.easeOut,
 		onFinish: function onFinish() {
-			game.removeChild(text);
-			coins.splice(coins.indexOf(text), 1);
+			if (text.parent) text.parent.removeChild(text);
+			var index = popupTexts.indexOf(text);
+			if (index >= 0) popupTexts.splice(index, 1);
 		}
 	});
 }
 function createDustParticles(x, y) {
-	for (var i = 0; i < 8; i++) {
+	for (var i = 0; i < 6; i++) {
 		var particle = new DustParticle();
-		particle.x = x + (Math.random() - 0.5) * 40;
-		particle.y = y + (Math.random() - 0.5) * 40;
+		particle.x = x + (Math.random() - 0.5) * 24;
+		particle.y = y + (Math.random() - 0.5) * 24;
 		game.addChild(particle);
 		dustParticles.push(particle);
 	}
 }
-function updateUI() {
-	coinText.setText('$' + gameState.coins);
-	streakText.setText('x' + gameState.streak);
-	jackpotBar.scaleX = gameState.jackpotMeter / gameState.jackpotMax;
-	jackpotText.setText(gameState.jackpotMeter + '/' + gameState.jackpotMax);
-	for (var i = 0; i < upgradeCards.length; i++) {
-		var baseCosts = [50, 75, 60, 80, 100, 70];
-		var level = gameState.upgrades[i];
-		var cost = Math.floor(baseCosts[i] * Math.pow(1.3, level));
-		upgradeCards[i].setUpgrade(i, level, cost);
+function resolveCurrentTicket(result) {
+	if (!currentTicket) return;
+	if (result.win) {
+		safePlaySound('winSound');
+		var basePayouts = [10, 25, 50];
+		var matchBonus = 1 + (result.count - 3) * 0.35;
+		var payoutUpgrade = 1 + gameState.upgrades[1] * 0.2;
+		var comboBoost = 1 + gameState.streak * (0.1 + gameState.upgrades[3] * 0.02);
+		var finalPayout = Math.floor(basePayouts[currentTicket.ticketType] * matchBonus * payoutUpgrade * comboBoost);
+		gameState.coins += finalPayout;
+		gameState.totalCoins += finalPayout;
+		gameState.streak++;
+		if (gameState.streak > gameState.bestStreak) {
+			gameState.bestStreak = gameState.streak;
+		}
+		if (finalPayout > gameState.biggestWin) {
+			gameState.biggestWin = finalPayout;
+		}
+		var jackpotGain = 1 + gameState.upgrades[4];
+		gameState.jackpotMeter += jackpotGain;
+		if (gameState.jackpotMeter >= gameState.jackpotMax) {
+			gameState.jackpotMeter = 0;
+			gameState.jackpotsHit++;
+			var jackpotReward = 100 + gameState.jackpotsHit * 25;
+			gameState.coins += jackpotReward;
+			gameState.totalCoins += jackpotReward;
+			createPopupText(currentTicket.x, currentTicket.y - 120, 'JACKPOT BONUS ' + formatMoney(jackpotReward), '#00ff88');
+		}
+		createPopupText(currentTicket.x, currentTicket.y, '+' + formatMoney(finalPayout), '#ffd700');
+	} else {
+		gameState.streak = 0;
+		createPopupText(currentTicket.x, currentTicket.y, 'NO MATCH', '#ff6b6b');
 	}
+	updateUI();
+	saveProgress();
 }
-function saveProgress() {
-	storage.coins = gameState.coins;
-	storage.totalCoins = gameState.totalCoins;
-	storage.bestStreak = gameState.bestStreak;
-	storage.jackpotMeter = gameState.jackpotMeter;
-	storage.ticketsScratchedTotal = gameState.ticketsScratchedTotal;
-	storage.biggestWin = gameState.biggestWin;
-	storage.jackpotsHit = gameState.jackpotsHit;
-	storage.prestigeCount = gameState.prestigeCount;
-	storage.prestigeChips = gameState.prestigeChips;
-	storage.upgrades = gameState.upgrades;
-}
-// Initialize UI and create first ticket
+/**** 
+* Boot
+****/ 
 initUI();
-createNewTicket(0);
 updateUI();
-// Play background music
-LK.playMusic('bgMusic', {
+safePlayMusic('bgMusic', {
 	loop: true
 });
-// Game update loop
+/**** 
+* Input
+****/ 
 game.down = function (x, y, obj) {
-	if (currentTicket && Math.abs(currentTicket.x - x) < 350 && Math.abs(currentTicket.y - y) < 450) {
+	for (var i = 0; i < ticketBuyButtons.length; i++) {
+		var btnX = bottomPanel.x + ticketBuyButtons[i].x;
+		var btnY = bottomPanel.y + ticketBuyButtons[i].y;
+		if (pointInRect(x, y, btnX, btnY, ticketBuyButtons[i].hitWidth, ticketBuyButtons[i].hitHeight)) {
+			ticketBuyButtons[i].press();
+			return;
+		}
+	}
+	for (var j = 0; j < upgradeCards.length; j++) {
+		if (upgradeCards[j].containsGlobalPoint(x, y)) {
+			upgradeCards[j].press();
+			return;
+		}
+	}
+	if (currentTicket && !currentTicket.resolved && currentTicket.containsGlobalPoint(x, y)) {
 		dragData.active = true;
-		dragData.startX = x;
-		dragData.startY = y;
+		dragData.lastX = x;
+		dragData.lastY = y;
 	}
 };
 game.move = function (x, y, obj) {
-	if (dragData.active && currentTicket) {
-		var dx = x - dragData.startX;
-		var dy = y - dragData.startY;
-		var distance = Math.sqrt(dx * dx + dy * dy);
-		if (distance > 10) {
-			var scratchAmount = distance / 200;
-			currentTicket.updateScratch(scratchAmount);
-			createDustParticles(x, y);
-			LK.getSound('scratchSound').play();
-			dragData.startX = x;
-			dragData.startY = y;
-		}
+	for (var i = 0; i < ticketBuyButtons.length; i++) {
+		var btnGX = bottomPanel.x + ticketBuyButtons[i].x;
+		var btnGY = bottomPanel.y + ticketBuyButtons[i].y;
+		ticketBuyButtons[i].setHovered(pointInRect(x, y, btnGX, btnGY, ticketBuyButtons[i].hitWidth, ticketBuyButtons[i].hitHeight));
 	}
+	for (var j = 0; j < upgradeCards.length; j++) {
+		upgradeCards[j].setHovered(upgradeCards[j].containsGlobalPoint(x, y));
+	}
+	if (!dragData.active || !currentTicket || currentTicket.resolved) return;
+	if (!currentTicket.containsGlobalPoint(x, y)) return;
+	var dx = x - dragData.lastX;
+	var dy = y - dragData.lastY;
+	var distance = Math.sqrt(dx * dx + dy * dy);
+	if (distance > 6) {
+		var scratchAmount = distance / 450;
+		currentTicket.updateScratch(scratchAmount);
+		createDustParticles(x, y);
+		safePlaySound('scratchSound');
+		dragData.lastX = x;
+		dragData.lastY = y;
+		updateUI();
+	}
 };
 game.up = function (x, y, obj) {
 	dragData.active = false;
 };
+/**** 
+* Update
+****/ 
 game.update = function () {
-	// Update current ticket
-	if (currentTicket) {
-		currentTicket.update();
-		// Check if ticket is fully scratched
-		if (currentTicket.scratched && !currentTicket.resolved) {
-			currentTicket.resolved = true;
-			if (currentTicket.checkMatch()) {
-				// Win!
-				LK.getSound('winSound').play();
-				var basePayouts = [10, 25, 50];
-				var payout = basePayouts[currentTicket.ticketType] * (1 + gameState.upgrades[1] * 0.2);
-				var streakMultiplier = 1 + gameState.streak * 0.1;
-				var finalPayout = Math.floor(payout * streakMultiplier);
-				gameState.coins += finalPayout;
-				gameState.totalCoins += finalPayout;
-				gameState.streak++;
-				if (gameState.streak > gameState.bestStreak) {
-					gameState.bestStreak = gameState.streak;
-				}
-				if (finalPayout > gameState.biggestWin) {
-					gameState.biggestWin = finalPayout;
-				}
-				gameState.jackpotMeter += Math.floor(Math.random() * 3) + 1;
-				if (gameState.jackpotMeter >= gameState.jackpotMax) {
-					gameState.jackpotMeter = gameState.jackpotMax;
-				}
-				createCoinPopup(currentTicket.x, currentTicket.y, finalPayout);
-				// Auto create new ticket
-				LK.setTimeout(function () {
-					createNewTicket(Math.floor(Math.random() * 2));
-				}, 500);
-			} else {
-				// Loss
-				gameState.streak = 0;
-				LK.setTimeout(function () {
-					createNewTicket(0);
-				}, 500);
-			}
-		}
-	}
-	// Update dust particles
 	for (var i = dustParticles.length - 1; i >= 0; i--) {
-		dustParticles[i].update();
-		if (!dustParticles[i].parent) {
+		if (!dustParticles[i] || !dustParticles[i].parent) {
 			dustParticles.splice(i, 1);
+			continue;
 		}
+		dustParticles[i].update();
 	}
-	// Periodic save
 	if (LK.ticks % 300 === 0) {
 		saveProgress();
-		updateUI();
 	}
 };
\ No newline at end of file