diff --git a/qi81k80v08.js b/qi81k80v08.js
index 16a9beb..5ec8a82 100644
--- a/qi81k80v08.js
+++ b/qi81k80v08.js
@@ -2,22 +2,25 @@ if (!this.entityLoaded) {
 	return;
 }
 
-if (
-	GameLib.Utils.UndefinedOrNull(this.totalTime) ||
-	GameLib.Utils.UndefinedOrNull(this.spawnTime)
-) {
+if (GameLib.Utils.UndefinedOrNull(this.loaded)) {
+	
+	this.loaded = true;
+	
+	this.bull = this.entityLoaded.bull;
+	this.star = this.entityLoaded.star;
+	this.burger = this.entityLoaded.burger;
+	this.parcel = this.entityLoaded.parcel;
+	
+	this.bull.instance.visible = false;
+	this.star.instance.visible = false;
+	this.burger.instance.visible = false;
+	this.parcel.instance.visible = false;
 	
 	/**
 	 * This component is initializing - set the total time to 0
 	 */
 	this.totalTime = 0;
 	this.spawnTime = 0;
-	
-	var cow = GameLib.EntityManager.Instance.findComponentById('bvgbmo4bt1');
-	var burger = GameLib.EntityManager.Instance.findComponentById('c6pem3i8dt');
-		
-	cow.instance.visible = false;
-	burger.instance.visible = false;
 		
 	this.enemies = [];
 	
@@ -36,32 +39,39 @@ if (
 		);
 	}
 	
-	this.scene = GameLib.EntityManager.Instance.findComponentById('q1f5n01iqk');
-		
 	this.nextSpawnTime = this.getNextSpawnTime();
 	
 	this.spawnEnemy = function() {
 
-		var enemyType = Math.floor((Math.random() * 5) + 1);
-		var meshType = Math.floor((Math.random() * 2) + 1);		
+		var enemyType	= GameLib.Utils.GetRandomIntInclusive(1, 5);
+		var meshType	= GameLib.Utils.GetRandomIntInclusive(1, 4);		
 		
-		var y = Math.floor((Math.random() * 10) + 2);
+		var y = GameLib.Utils.GetRandomIntInclusive(2, 10));
 
 		var apiBox = new GameLib.D3.API.Mesh();
 
 		apiBox.materials = [this.boxMaterial];
 
-		var speed = 0.5;
+		var speed = 1;
 		
-		var box = null;
+		var mesh = null;
 		if (meshType === 1) {
-			box = cow.clone();
-		} else {
-			box = burger.clone();
+			mesh = this.bull.clone();
+			speed = 0.2;
+		} else if (meshType === 2) {
+			mesh = this.star.clone();
 			speed = 0.3;
+		} else if (meshType === 3) {
+			mesh = this.burger.clone();
+			speed = 0.4;
+		} else if (meshType === 4) {
+			mesh = this.parcel.clone();
+			speed = 0.5;
+		} else {
+			console.log('unknown mesh type : ' + meshType);
 		}
 		
-		box.instance.visible = true;
+		mesh.instance.visible = true;
 		
 		var velocity = null;
 
@@ -73,10 +83,8 @@ if (
 
 		var rotation = {x : rotX, y: rotY, z: rotZ};
 		
-		
-		
 		var enemy = {
-			mesh : box
+			mesh : mesh
 		};
 
 		if (enemyType === 1) {
@@ -114,6 +122,8 @@ if (
 		enemy.mesh.updateInstancePosition();
 
 		enemy.velocity = velocity;
+		enemy.rotation = rotation;
+		
 		enemy.lifeTime = 0;
 		enemy.life = 15;
 
@@ -134,6 +144,8 @@ this.enemies = this.enemies.reduce(
 	function(result, enemy) {
 		enemy.mesh.position.add(enemy.velocity);
 		enemy.mesh.updateInstancePosition();
+		
+		enemy.mesh.rotation.add(enemy.rotation);
 		enemy.lifeTime += data.delta;
 		if (enemy.lifeTime > enemy.life) {
 			GameLib.Event.Emit(