===================================================================
--- original.js
+++ change.js
@@ -66,22 +66,61 @@
 		}
 		fishGraphics.rotation = self.rotation;
 	};
 });
-var ClownFish = Fish.expand(function () {
-	var self = Fish.call(this);
+var ClownFish = Container.expand(function () {
+	var self = Container.call(this);
 	var fishGraphics = self.createAsset('clownFish', 'Clown Fish Graphics', .5, .5);
 	self.speed = 0.5;
 });
-var TangFish = Fish.expand(function () {
-	var self = Fish.call(this);
+var TangFish = Container.expand(function () {
+	var self = Container.call(this);
 	var fishGraphics = self.createAsset('tangFish', 'Tang Fish Graphics', .5, .5);
 	self.speed = 0.65;
 });
-var AngelFish = Fish.expand(function () {
-	var self = Fish.call(this) || this;
+var AngelFish = Container.expand(function () {
+	var self = Container.call(this);
+	self.getWaterBounds = function () {
+		var waterGraphics = LK.getAsset('water', 'Water Graphics', 0, 0);
+		return {
+			left: (2048 - waterGraphics.width) / 2,
+			right: (2048 + waterGraphics.width) / 2,
+			top: (2732 - waterGraphics.height) / 2 - 150,
+			bottom: (2732 + waterGraphics.height) / 2 - 150
+		};
+	};
 	var fishGraphics = self.createAsset('angelFish', 'Angel Fish Graphics', .5, .5);
 	self.speed = 0.75;
+	self.move = 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() * 180 + 90;
+		}
+		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 Game = Container.expand(function () {
 	var self = Container.call(this);
 	var aquarium = self.addChild(new Aquarium());
@@ -90,17 +129,19 @@
 	var fishTypes = [Fish, AngelFish, ClownFish, TangFish];
 	for (var i = 0; i < fishTypes.length; i++) {
 		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 distance = Math.random() * maxDistance;
-			fish.x = centerX + distance * Math.cos(angle);
-			fish.y = centerY + distance * Math.sin(angle);
-			fishes.push(fish);
-			self.addChild(fish);
+			if (typeof fish.move === 'function') {
+				var centerX = 2048 / 2;
+				var centerY = 2732 / 2;
+				var maxDistance = 600;
+				var angle = Math.random() * Math.PI * 2;
+				var distance = Math.random() * maxDistance;
+				fish.x = centerX + distance * Math.cos(angle);
+				fish.y = centerY + distance * Math.sin(angle);
+				fishes.push(fish);
+				self.addChild(fish);
+			}
 		}
 	}
 	LK.on('tick', function () {
 		for (var i = 0; i < fishes.length; i++) {