===================================================================
--- original.js
+++ change.js
@@ -1,357 +1,28 @@
 /**** 
 * Classes
 ****/ 
-var Aquarium = Container.expand(function () {
+var AngelFish = Container.expand(function () {
 	var self = Container.call(this);
-	this.getWaterBounds = function () {
+	self.getWaterBounds = function () {
 		var waterGraphics = LK.getAsset('water', {});
 		return {
 			left: (2048 - waterGraphics.width) / 2,
 			right: (2048 + waterGraphics.width) / 2,
 			top: (2732 - waterGraphics.height) / 2 - 150,
 			bottom: (2732 + waterGraphics.height) / 2 - 150
 		};
 	};
-	var aquariumGraphics = self.attachAsset('aquarium', {});
-	aquariumGraphics.width = 2048 * 1.3;
-	aquariumGraphics.height = 2732 * 1.3;
-	aquariumGraphics.x = (2048 - aquariumGraphics.width) / 2;
-	aquariumGraphics.y = (2732 - aquariumGraphics.height) / 2;
-	self.addChild(aquariumGraphics);
-	var waterGraphics = self.attachAsset('water', {});
-	waterGraphics.width = 2048 / 3 * 2 * 1.08;
-	waterGraphics.height = 2732 / 3 * 1.26;
-	waterGraphics.x = (2048 - waterGraphics.width) / 2;
-	waterGraphics.y = (2732 - waterGraphics.height) / 2 - 150;
-	waterGraphics.alpha = 0;
-	self.addChild(waterGraphics);
-});
-var Fish = Container.expand(function () {
-	var self = Container.call(this);
-	self.avoidObstacles = function (obstacles) {};
-	self.isPathBlocked = function (newX, newY, obstacles) {
-		return false;
-	};
-	self.getNearbyObstacles = function () {
-		return [];
-	};
-	this.getWaterBounds = function () {
-		var waterGraphics = LK.getAsset('water', {});
-		return {
-			left: (2048 - waterGraphics.width) / 2,
-			right: (2048 + waterGraphics.width) / 2,
-			top: (2732 - waterGraphics.height) / 2 - 150,
-			bottom: (2732 + waterGraphics.height) / 2 - 150
-		};
-	};
-});
-var YellowTang = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('yellowTang', {
+	var fishGraphics = self.attachAsset('angelFish', {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.5;
-	self._move_migrated = function () {};
-});
-var Wrasses = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('wrasses', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.42;
-	self._move_migrated = function () {};
-});
-var Tangfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('tangfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.47;
-	self._move_migrated = function () {};
-});
-var Surgeonfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('surgeonfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = (Math.random() * 0.2 + 0.5) * 2;
+	self.speed = 0.75;
 	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 120 + 60;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		var newX = self.x + Math.cos(self.rotation) * self.speed;
-		var newY = self.y + Math.sin(self.rotation) * self.speed;
-		var obstacles = self.getNearbyObstacles();
-		if (self.isPathBlocked(newX, newY, obstacles)) {
-			self.avoidObstacles(obstacles);
-		} else {
-			self.x = newX;
-			self.y = newY;
-		}
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var Sunfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('sunfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.6;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 200 + 100;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var Starfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('starfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.5;
-	self._move_migrated = function () {
-		self.x += Math.sin(LK.ticks / 30) * self.speed;
-		self.y += Math.cos(LK.ticks / 30) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right || self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.x = Math.max(waterBounds.left, Math.min(self.x, waterBounds.right));
-			self.y = Math.max(waterBounds.top, Math.min(self.y, waterBounds.bottom));
-		}
-		fishGraphics.rotation = LK.ticks / 30;
-	};
-});
-var RoyalGramma = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('royalGramma', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.5;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 160 + 100;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var RibbonEel = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('ribbonEel', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.6;
-	self._move_migrated = function () {};
-});
-var RainbowTrout = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('rainbowTrout', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.53;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 160 + 120;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var Pufferfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('pufferfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.4;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 140 + 80;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		var tentativeX = self.x + Math.cos(self.rotation) * self.speed;
-		var tentativeY = self.y + Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		tentativeX = Math.max(waterBounds.left, Math.min(tentativeX, waterBounds.right));
-		tentativeY = Math.max(waterBounds.top, Math.min(tentativeY, waterBounds.bottom));
-		self.x = tentativeX;
-		self.y = tentativeY;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var PsychedelicFrogfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('psychedelicFrogfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.4;
-	self._move_migrated = function () {};
-});
-var PeacockBass = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('peacockBass', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.65;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 220 + 160;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed * 1.6;
-		self.y += Math.sin(self.rotation) * self.speed * 1.6;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var Parrotfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('parrotfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.50;
-	self._move_migrated = function () {};
-});
-var OscarFish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('oscarFish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.5;
-	self._move_migrated = function () {
 		if (self.targetRotation === undefined || LK.ticks - self.rotationStartTime >= self.rotationDuration) {
 			self.targetRotation = Math.random() * Math.PI * 2;
 			self.rotationStartTime = LK.ticks;
-			self.rotationDuration = Math.random() * 150 + 100;
+			self.rotationDuration = Math.random() * 180 + 90;
 		}
 		var progress = (LK.ticks - self.rotationStartTime) / self.rotationDuration;
 		if (progress < 1) {
 			var deltaRotation = (self.targetRotation - self.rotation) * progress;
@@ -376,396 +47,61 @@
 		}
 		fishGraphics.rotation = self.rotation;
 	};
 });
-var NeonTetra = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('neonTetra', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.3;
-	self._move_migrated = function () {
-		if (self.targetRotation === undefined || LK.ticks - self.rotationStartTime >= self.rotationDuration) {
-			self.targetRotation = Math.random() * Math.PI * 2;
-			self.rotationStartTime = LK.ticks;
-			self.rotationDuration = Math.random() * 100 + 50;
-		}
-		var progress = (LK.ticks - self.rotationStartTime) / self.rotationDuration;
-		if (progress < 1) {
-			var deltaRotation = (self.targetRotation - self.rotation) * progress;
-			self.rotation += deltaRotation;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		if (Math.cos(self.rotation) < 0) {
-			fishGraphics.scale.x = -1;
-		} else {
-			fishGraphics.scale.x = 1;
-		}
-		fishGraphics.rotation = self.rotation;
+var Aquarium = Container.expand(function () {
+	var self = Container.call(this);
+	this.getWaterBounds = function () {
+		var waterGraphics = this.getChildByName('Water Graphics');
+		return {
+			left: (2048 - waterGraphics.width) / 2,
+			right: (2048 + waterGraphics.width) / 2,
+			top: (2732 - waterGraphics.height) / 2 - 150,
+			bottom: (2732 + waterGraphics.height) / 2 - 150
+		};
 	};
+	var aquariumGraphics = self.attachAsset('aquarium', {});
+	aquariumGraphics.width = 2048 * 1.3;
+	aquariumGraphics.height = 2732 * 1.3;
+	aquariumGraphics.x = (2048 - aquariumGraphics.width) / 2;
+	aquariumGraphics.y = (2732 - aquariumGraphics.height) / 2;
+	self.addChild(aquariumGraphics);
+	var waterGraphics = self.attachAsset('water', {});
+	waterGraphics.width = 2048 / 3 * 2 * 1.2;
+	waterGraphics.height = 2732 / 3 * 1.4;
+	waterGraphics.x = (2048 - waterGraphics.width) / 2;
+	waterGraphics.y = (2732 - waterGraphics.height) / 2 - 150;
+	waterGraphics.alpha = 0;
+	self.addChild(waterGraphics);
 });
-var MoorishIdol = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('moorishidol', {
+var ClownFish = Container.expand(function () {
+	var self = Container.call(this);
+	var fishGraphics = self.attachAsset('clownFish', {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.43;
-	self._move_migrated = function () {};
+	self.speed = 0.5;
 });
-var Moonfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('moonfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.55;
-	self._move_migrated = function () {
-		self.x += Math.cos(LK.ticks / 60) * self.speed;
-		self.y += Math.sin(LK.ticks / 60) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right || self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.x = Math.max(waterBounds.left, Math.min(self.x, waterBounds.right));
-			self.y = Math.max(waterBounds.top, Math.min(self.y, waterBounds.bottom));
-		}
-		fishGraphics.rotation = Math.atan2(Math.sin(LK.ticks / 60), Math.cos(LK.ticks / 60));
+var Fish = Container.expand(function () {
+	var self = Container.call(this);
+	self.getWaterBounds = function () {
+		var waterGraphics = LK.getAsset('water', {});
+		return {
+			left: (2048 - waterGraphics.width) / 2,
+			right: (2048 + waterGraphics.width) / 2,
+			top: (2732 - waterGraphics.height) / 2 - 150,
+			bottom: (2732 + waterGraphics.height) / 2 - 150
+		};
 	};
-});
-var Mandarinfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('mandarinfish', {
+	var fishGraphics = self.attachAsset('fish', {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.4;
-	self._move_migrated = function () {};
-});
-var Lionfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('lionfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.5;
-	self._move_migrated = function () {};
-});
-var LeafySeaDragon = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('leafySeaDragon', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.4;
-	self._move_migrated = function () {};
-});
-var KoiFish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('koiFish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.48;
+	self.speed = 0.625;
 	self._move_migrated = function () {
 		if (self.targetRotation === undefined || LK.ticks - self.rotationStartTime >= self.rotationDuration) {
 			self.targetRotation = Math.random() * Math.PI * 2;
 			self.rotationStartTime = LK.ticks;
-			self.rotationDuration = Math.random() * 130 + 70;
-		}
-		var progress = (LK.ticks - self.rotationStartTime) / self.rotationDuration;
-		if (progress < 1) {
-			var deltaRotation = (self.targetRotation - self.rotation) * progress;
-			self.rotation += deltaRotation;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		if (Math.cos(self.rotation) < 0) {
-			fishGraphics.scale.x = -1;
-		} else {
-			fishGraphics.scale.x = 1;
-		}
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var GuppyFish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('guppyFish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.35;
-	self._move_migrated = function () {
-		if (self.targetRotation === undefined || LK.ticks - self.rotationStartTime >= self.rotationDuration) {
-			self.targetRotation = Math.random() * Math.PI * 2;
-			self.rotationStartTime = LK.ticks;
-			self.rotationDuration = Math.random() * 100 + 50;
-		}
-		var progress = (LK.ticks - self.rotationStartTime) / self.rotationDuration;
-		if (progress < 1) {
-			var deltaRotation = (self.targetRotation - self.rotation) * progress;
-			self.rotation += deltaRotation;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		if (Math.cos(self.rotation) < 0) {
-			fishGraphics.scale.x = -1;
-		} else {
-			fishGraphics.scale.x = 1;
-		}
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var Goldfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('goldfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.4;
-	self._move_migrated = function () {
-		if (self.targetRotation === undefined || LK.ticks - self.rotationStartTime >= self.rotationDuration) {
-			self.targetRotation = Math.random() * Math.PI * 2;
-			self.rotationStartTime = LK.ticks;
-			self.rotationDuration = Math.random() * 140 + 80;
-		}
-		var progress = (LK.ticks - self.rotationStartTime) / self.rotationDuration;
-		if (progress < 1) {
-			var deltaRotation = (self.targetRotation - self.rotation) * progress;
-			self.rotation += deltaRotation;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		if (Math.cos(self.rotation) < 0) {
-			fishGraphics.scale.x = -1;
-		} else {
-			fishGraphics.scale.x = 1;
-		}
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var GlassCatfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('glassCatfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.45;
-	self._move_migrated = function () {
-		self.x += Math.cos(LK.ticks / 100) * self.speed;
-		self.y += Math.sin(LK.ticks / 100) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right || self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.x = Math.max(waterBounds.left, Math.min(self.x, waterBounds.right));
-			self.y = Math.max(waterBounds.top, Math.min(self.y, waterBounds.bottom));
-		}
-		fishGraphics.rotation = Math.atan2(Math.sin(LK.ticks / 100), Math.cos(LK.ticks / 100));
-	};
-});
-var FlameScallop = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('flameScallop', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.3;
-	self._move_migrated = function () {};
-});
-var FlameHawkfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('flameHawkfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.48;
-	self._move_migrated = function () {};
-});
-var FlameAngel = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('flameAngel', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.55;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 170 + 90;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var EmperorFish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('emperorFish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.5;
-	self._move_migrated = function () {};
-});
-var EmeraldGoby = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('emeraldGoby', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.42;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 110 + 55;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var ElectricCatfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('electricCatfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.58;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 190 + 130;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var ElectricBlueDamsel = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('electricBlueDamsel', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.45;
-	self._move_migrated = function () {};
-});
-var DiscusFish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('discusFish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.45;
-	self._move_migrated = function () {
-		if (self.targetRotation === undefined || LK.ticks - self.rotationStartTime >= self.rotationDuration) {
-			self.targetRotation = Math.random() * Math.PI * 2;
-			self.rotationStartTime = LK.ticks;
 			self.rotationDuration = Math.random() * 120 + 60;
 		}
 		var progress = (LK.ticks - self.rotationStartTime) / self.rotationDuration;
 		if (progress < 1) {
@@ -791,294 +127,16 @@
 		}
 		fishGraphics.rotation = self.rotation;
 	};
 });
-var DiamondTetra = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('diamondTetra', {
+var TangFish = Container.expand(function () {
+	var self = Container.call(this);
+	var fishGraphics = self.attachAsset('tangFish', {
 		anchorX: 0.5,
 		anchorY: 0.5
 	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.4;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 100 + 50;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
+	self.speed = 0.65;
 });
-var Dartfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('dartfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.45;
-	self._move_migrated = function () {};
-});
-var CrimsonSnapper = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('crimsonSnapper', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.57;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 130 + 65;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var Clownfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('clownfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.4;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 110 + 70;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		var tentativeX = self.x + Math.cos(self.rotation) * self.speed * 2;
-		var tentativeY = self.y + Math.sin(self.rotation) * self.speed * 2;
-		var waterBounds = self.getWaterBounds();
-		tentativeX = Math.max(waterBounds.left, Math.min(tentativeX, waterBounds.right));
-		tentativeY = Math.max(waterBounds.top, Math.min(tentativeY, waterBounds.bottom));
-		self.x = tentativeX;
-		self.y = tentativeY;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var ClownTriggerfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('clownTriggerfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.5;
-	self._move_migrated = function () {};
-});
-var CardinalTetra = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('cardinalTetra', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.3;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 90 + 60;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var Butterflyfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('butterflyfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.45;
-	self._move_migrated = function () {};
-});
-var BlueTang = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('blueTang', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.52;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 150 + 110;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var BettaFish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('bettaFish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.5;
-	self._move_migrated = function () {
-		if (self.targetRotation === undefined || LK.ticks - self.rotationStartTime >= self.rotationDuration) {
-			self.targetRotation = Math.random() * Math.PI * 2;
-			self.rotationStartTime = LK.ticks;
-			self.rotationDuration = Math.random() * 150 + 100;
-		}
-		var progress = (LK.ticks - self.rotationStartTime) / self.rotationDuration;
-		if (progress < 1) {
-			var deltaRotation = (self.targetRotation - self.rotation) * progress;
-			self.rotation += deltaRotation;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		self.rotation = self.rotation % (Math.PI * 2);
-		if (Math.cos(self.rotation) < 0) {
-			fishGraphics.scale.x = -1;
-		} else {
-			fishGraphics.scale.x = 1;
-		}
-		fishGraphics.rotation = self.rotation;
-	};
-});
-var Bannerfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('bannerfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.46;
-	self._move_migrated = function () {};
-});
-var Angelfish = Fish.expand(function () {
-	var self = Fish.call(this);
-	var fishGraphics = self.attachAsset('angelfish', {
-		anchorX: 0.5,
-		anchorY: 0.5
-	});
-	fishGraphics.scale.set(1, 1);
-	self.speed = Math.random() * 0.2 + 0.45;
-	self._move_migrated = function () {
-		if (!self.directionChangeTime || LK.ticks - self.directionChangeTime > self.directionChangeInterval) {
-			self.directionChangeTime = LK.ticks;
-			self.directionChangeInterval = Math.random() * 130 + 90;
-			self.targetRotation = Math.random() * Math.PI * 2;
-		}
-		var progress = (LK.ticks - self.directionChangeTime) / self.directionChangeInterval;
-		if (progress < 1) {
-			self.rotation += (self.targetRotation - self.rotation) * progress;
-		} else {
-			self.rotation = self.targetRotation;
-		}
-		self.x += Math.cos(self.rotation) * self.speed;
-		self.y += Math.sin(self.rotation) * self.speed;
-		var waterBounds = self.getWaterBounds();
-		if (self.x < waterBounds.left || self.x > waterBounds.right) {
-			self.rotation = Math.PI - self.rotation;
-		}
-		if (self.y < waterBounds.top || self.y > waterBounds.bottom) {
-			self.rotation = -self.rotation;
-		}
-		fishGraphics.scale.x = Math.cos(self.rotation) < 0 ? -1 : 1;
-		fishGraphics.rotation = self.rotation;
-	};
-});
 
 /**** 
 * Initialize Game
 ****/ 
@@ -1091,24 +149,19 @@
 ****/ 
 var aquarium = game.addChild(new Aquarium());
 game.setBackgroundColor(0x008080);
 var fishes = [];
-var fishTypes = [Wrasses, Parrotfish, Dartfish, MoorishIdol, Tangfish, Bannerfish, Butterflyfish, Mandarinfish, Lionfish, Surgeonfish, Pufferfish, Clownfish, Angelfish, KoiFish, EmperorFish, Goldfish, Sunfish, GuppyFish, BettaFish, DiscusFish, NeonTetra, OscarFish, PsychedelicFrogfish, FlameScallop, RibbonEel, LeafySeaDragon, ClownTriggerfish, ElectricBlueDamsel, YellowTang, FlameHawkfish, RoyalGramma, FlameAngel, BlueTang, Moonfish, Starfish, CardinalTetra];
+var fishTypes = [Fish, AngelFish, ClownFish, TangFish];
 for (var i = 0; i < fishTypes.length; i++) {
-	var fish = new fishTypes[i]();
-	if (typeof fish._move_migrated === 'function') {
-		var waterBounds = aquarium.getWaterBounds();
-		var waterWidth = waterBounds.right - waterBounds.left;
-		var waterHeight = waterBounds.bottom - waterBounds.top;
-		var waterCenterX = waterBounds.left + waterWidth / 2;
-		var waterCenterY = waterBounds.top + waterHeight / 2;
-		var maxDistanceX = waterWidth / 2 * 0.8;
-		var maxDistanceY = waterHeight / 2 * 0.8;
+	for (var j = 0; j < 2; j++) {
+		var fish = new fishTypes[i]();
+		var centerX = 2048 / 2;
+		var centerY = 2732 / 2;
+		var maxDistance = 600;
 		var angle = Math.random() * Math.PI * 2;
-		var distanceX = Math.random() * maxDistanceX;
-		var distanceY = Math.random() * maxDistanceY;
-		fish.x = waterCenterX + distanceX * Math.cos(angle);
-		fish.y = waterCenterY + distanceY * Math.sin(angle);
+		var distance = Math.random() * maxDistance;
+		fish.x = centerX + distance * Math.cos(angle);
+		fish.y = centerY + distance * Math.sin(angle);
 		fishes.push(fish);
 		game.addChild(fish);
 	}
 }