===================================================================
--- original.js
+++ change.js
@@ -139,15 +139,25 @@
 	var self = Container.call(this);
 	self.decorate = function () {};
 	self.updateDecoration = function () {};
 });
-var DecorativeCastle = AquariumDecorator.expand(function () {
-	var self = AquariumDecorator.call(this) || this;
-	var castleGraphics = self.createAsset('decorativeCastle', 'Decorative Castle Graphics', 0.5, 1);
-	castleGraphics.width = 300;
-	castleGraphics.height = 400;
+var HidingCastle = AquariumDecorator.expand(function () {
+	var self = AquariumDecorator.call(this);
+	self.castleGraphics = self.createAsset('decorativeCastle', 'Decorative Castle Graphics', 0.5, 1);
+	self.castleGraphics.width = 300;
+	self.castleGraphics.height = 400;
 	self.x = 1024;
-	self.y = 2732 - castleGraphics.height / 2;
+	self.y = 2732 - self.castleGraphics.height / 2;
+	self.provideHiding = function (fish) {
+		if (fish.size < 30 && self.distanceTo(fish) < 100) {
+			fish.isHidden = true;
+			fish.alpha = 0.5;
+		} else {
+			fish.isHidden = false;
+			fish.alpha = 1.0;
+		}
+	};
+	return self;
 });
 var HidingBehavior = Container.expand(function () {
 	var self = Container.call(this);
 	self.hide = function (fish, castle) {
@@ -400,15 +410,14 @@
 var Cleaner = Container.expand(function () {
 	var self = Container.call(this);
 	self.clean = function () {};
 });
-var AquariumCleaner = Cleaner.expand(function () {
-	var self = Cleaner.call(this) || this;
-	var cleanerGraphics = self.createAsset('aquariumCleaner', 'Aquarium Cleaner Graphics', 0.5, 0.5);
+var CleaningRobot = Container.expand(function () {
+	var self = Container.call(this);
 	self.speed = 0.2;
 	self.cleaningRate = 1;
 	self.cleaningBehavior = new CleaningBehavior();
-	self.update = function () {
+	self.moveAndClean = function () {
 		var dirtyObjects = self.cleaningBehavior.findDirtyObjects();
 		dirtyObjects.forEach(function (obj) {
 			self.x += (obj.x - self.x) * self.speed;
 			self.y += (obj.y - self.y) * self.speed;
@@ -416,8 +425,10 @@
 				self.cleaningBehavior.cleanObject(obj, self.cleaningRate);
 			}
 		});
 	};
+	LK.setInterval(self.moveAndClean, 1000);
+	return self;
 });
 var CleaningBehavior = Container.expand(function () {
 	var self = Container.call(this);
 	self.findDirtyObjects = function () {
@@ -629,22 +640,23 @@
 			self.destroy();
 		}
 	});
 });
-var FeedingArea = Container.expand(function () {
+var FishFeeder = Container.expand(function () {
 	var self = Container.call(this);
-	var areaGraphics = self.createAsset('feedingArea', 'Feeding Area Graphics', 0.5, 0.5);
-	self.spawnFood = function () {
+	self.feedingRate = 5000;
+	self.feed = function () {
 		var food = new Food();
-		food.x = self.x + (Math.random() - 0.5) * areaGraphics.width;
-		food.y = self.y + (Math.random() - 0.5) * areaGraphics.height;
+		food.x = 1024;
+		food.y = 1366;
 		LK.stageContainer.addChild(food);
 		var nearbyFish = self.getNearbyFishWithinRange(500);
 		nearbyFish.forEach(function (fish) {
 			fish.rushToFood(food);
 		});
 	};
-	LK.setInterval(self.spawnFood, 5000);
+	LK.setInterval(self.feed, self.feedingRate);
+	return self;
 });
 var IntelligentFishBehavior = Container.expand(function () {
 	var self = Container.call(this);
 	self.intelligenceLevel = 5;
@@ -1576,13 +1588,13 @@
 		}
 		fishGraphics.rotation = self.rotation;
 	};
 });
-var BubbleGenerator = Container.expand(function (bubbleRate) {
+var BubbleMachine = Container.expand(function () {
 	var self = Container.call(this);
-	self.bubbleRate = bubbleRate || 1000;
+	self.bubbleRate = 1000;
 	self.createBubble = function () {
-		var bubble = new Bubble();
+		var bubble = new RisingBubble();
 		bubble.x = Math.random() * 2048;
 		bubble.y = 2732;
 		LK.stageContainer.addChild(bubble);
 	};