===================================================================
--- original.js
+++ change.js
@@ -81,10 +81,60 @@
 			self.parent.randomTextActive = false;
 		}, 3000);
 	};
 });
+var BadElf = Container.expand(function (spawnX, spawnY, gameInstance) {
+	var self = Container.call(this);
+	self.gameInstance = gameInstance;
+	self.spawnedMagicCount = 1;
+	self.magicShootingInterval = LK.setInterval(function () {
+		if (self.visible && self.gameInstance && self.gameInstance.activeMagicCount < self.gameInstance.maxMagicAllowed) {
+			var magic = new Magic(self.x + 125, self.y, self.gameInstance);
+			self.gameInstance.addChild(magic);
+			self.gameInstance.activeMagicCount++;
+			self.spawnedMagicCount++;
+			if (self.spawnedMagicCount >= 2) {
+				self.alpha = 1;
+				var fadeOutInterval;
+				var fadeOut = function () {
+					if (self.alpha > 0) {
+						self.alpha -= 0.05;
+					} else {
+						LK.clearInterval(fadeOutInterval);
+						self.gameInstance.activeBadElves--;
+						self.destroy();
+						LK.setTimeout(function () {
+							self.gameInstance.spawnBadElf();
+						}, 2000);
+					}
+				};
+				LK.clearInterval(self.magicShootingInterval);
+				fadeOutInterval = LK.setInterval(fadeOut, 60);
+				self.magicShootingInterval = null;
+			}
+		}
+	}, Math.random() * (6000 - 2000) + 2000);
+	var badElfGraphics = self.createAsset('badElf', 'Mischievous Elf', 0.5, 0.5);
+	self.x = spawnX;
+	self.y = spawnY;
+	self.on('down', function (obj) {
+		LK.setScore(LK.getScore() + 3);
+		LK.gui.topCenter.children[0].setText(LK.getScore().toString());
+		this.gameInstance.activeBadElves--;
+		var obstacleBox = new ObstacleBox(this.x, this.y, this.gameInstance);
+		obstacleBox.x = this.x;
+		obstacleBox.y = this.y;
+		this.parent.addChild(obstacleBox);
+		LK.setTimeout(function () {
+			obstacleBox.destroy();
+		}, 1000);
+		LK.clearInterval(this.magicShootingInterval);
+		this.destroy();
+	});
+});
 var Magic = Container.expand(function (x, y, gameInstance) {
 	var self = Container.call(this);
+	console.log("magic creation triggered");
 	self.gameInstance = gameInstance;
 	self.moveEnabled = true;
 	self.rotation = 0;
 	var magicGraphics = self.createAsset('magic', 'Magic effect', 0.5, 0.5);
@@ -109,9 +159,9 @@
 				self.x += normX * speed;
 				self.y += normY * speed;
 			}
 			console.log("distance = " + distance);
-			if (distance <= 150) {
+			if (distance <= 100) {
 				console.log('Hit threshold met. Game over triggered.');
 				self.gameInstance.triggerGameOver();
 			}
 			if (self.gameInstance.santa) {} else if (self.x < 0 || self.x > 2048 || self.y < 0 || self.y > 2732) {
@@ -138,57 +188,8 @@
 		this.gameInstance.activeMagicCount--;
 		this.destroy();
 	});
 });
-var BadElf = Container.expand(function (spawnX, spawnY, gameInstance) {
-	var self = Container.call(this);
-	self.gameInstance = gameInstance;
-	self.spawnedMagicCount = 1;
-	self.magicShootingInterval = LK.setInterval(function () {
-		if (self.visible && self.gameInstance && self.gameInstance.activeMagicCount < self.gameInstance.maxMagicAllowed) {
-			var magic = new Magic(self.x + 125, self.y, self.gameInstance);
-			self.gameInstance.addChild(magic);
-			self.gameInstance.activeMagicCount++;
-			self.spawnedMagicCount++;
-			if (self.spawnedMagicCount >= 2) {
-				self.alpha = 1;
-				var fadeOutInterval;
-				var fadeOut = function () {
-					if (self.alpha > 0) {
-						self.alpha -= 0.05;
-					} else {
-						LK.clearInterval(fadeOutInterval);
-						self.gameInstance.activeBadElves--;
-						self.destroy();
-						LK.setTimeout(function () {
-							self.gameInstance.spawnBadElf();
-						}, 2000);
-					}
-				};
-				LK.clearInterval(self.magicShootingInterval);
-				fadeOutInterval = LK.setInterval(fadeOut, 60);
-				self.magicShootingInterval = null;
-			}
-		}
-	}, Math.random() * (6000 - 2000) + 2000);
-	var badElfGraphics = self.createAsset('badElf', 'Mischievous Elf', 0.5, 0.5);
-	self.x = spawnX;
-	self.y = spawnY;
-	self.on('down', function (obj) {
-		LK.setScore(LK.getScore() + 3);
-		LK.gui.topCenter.children[0].setText(LK.getScore().toString());
-		this.gameInstance.activeBadElves--;
-		var obstacleBox = new ObstacleBox(this.x, this.y, this.gameInstance);
-		obstacleBox.x = this.x;
-		obstacleBox.y = this.y;
-		this.parent.addChild(obstacleBox);
-		LK.setTimeout(function () {
-			obstacleBox.destroy();
-		}, 1000);
-		LK.clearInterval(this.magicShootingInterval);
-		this.destroy();
-	});
-});
 var Mistletoe = Container.expand(function (gameInstance) {
 	var self = Container.call(this);
 	self.gameInstance = gameInstance;
 	var mistletoeGraphics = self.createAsset('mistletoe', 'Mistletoe', 0.5, 0.5);
@@ -260,10 +261,17 @@
 	};
 	var crosshairGraphics = self.createAsset('crosshair', 'Crosshair', .5, .5);
 	self.y = -crosshairGraphics.height / 2;
 });
+self.maxMagicAllowed = 3;
+if (self.activeMagicCount < self.maxMagicAllowed) {
+	var magicInstance = new Magic(this.magicSpawnX, this.magicSpawnY, self);
+	self.addChild(magicInstance);
+	self.activeMagicCount++;
+}
 var Game = Container.expand(function () {
 	var self = Container.call(this);
+	self.maxMagicAllowed = 3;
 	this.triggerGameOver = function () {
 		this.isGameOver = true;
 		LK.showGameOver();
 		LK.on('tick', function () {
@@ -291,14 +299,8 @@
 	this.triggerGameOver = function () {
 		this.isGameOver = true;
 		LK.showGameOver();
 	};
-	self.maxMagicAllowed = 3;
-	if (self.activeMagicCount < self.maxMagicAllowed) {
-		var magicInstance = new Magic(this.magicSpawnX, this.magicSpawnY, self);
-		self.addChild(magicInstance);
-		self.activeMagicCount++;
-	}
 	self.respawnReindeer = function (reindeer) {
 		LK.setTimeout(function () {
 			var newReindeer = new Reindeer(self);
 			var spawnLeftSide = Math.random() < 0.5;
@@ -517,12 +519,9 @@
 			var badElf = new BadElf(location.x, location.y, self);
 			var scaleModifier = Math.random() * 0.25 + 0.75;
 			badElf.scale.set(scaleModifier, scaleModifier);
 			self.addChildAt(badElf, self.getChildIndex(room1Background) + 1);
-			var magic = new Magic(badElf.x + badElf.width / 2, badElf.y, self);
 			self.activeBadElves++;
-			self.addChildAt(magic, self.getChildIndex(santa));
-			var bulletStartY = badElf.y - badElf.height;
 		}
 	};
 	var muzzleFlash = new MuzzleFlash();
 	muzzleFlash.x = santa.x - santa.santaGraphics.width + 400;