diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java
index 22c0568..356bfd3 100644
--- a/src/main/java/cactusServer/entities/Player.java
+++ b/src/main/java/cactusServer/entities/Player.java
@@ -15,6 +15,7 @@
 	private String instanceID;
 	private String characterID;
 	private String areaURI;
+	private Object3D object;
 	private Position3D position;
 	private Quaternion3D angle;
 	private CameraState cameraState;
@@ -57,6 +58,7 @@
 		String[] instanceURISplit = instanceID.split("/"); // �c�c/instances/{instanceId}
 		String instanceId = instanceURISplit[instanceURISplit.length - 1];
 		Instances.getInstance().getInstance(instanceId).getUniverse().place(this.getPlaceable());
+		setObject(body);
 	}
 
 	public String getInstanceID() {
@@ -203,4 +205,14 @@
 		// if (character == null) return;
 		character.update(position, angle, areaURI);
 	}
+	
+	@JSONHint(ignore = true)
+	public Object3D getObject() {
+		return object;
+	}
+
+	public void setObject(Object3D object) {
+		this.object = object;
+	}
+
 }
diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java
index 16f3c41..fe0cfb6 100644
--- a/src/main/java/cactusServer/models/CollisionManager.java
+++ b/src/main/java/cactusServer/models/CollisionManager.java
@@ -35,13 +35,13 @@
 	}
 
 	public void collisionRun(long interval) {
-		for (Instance instance : instances.values()) {
+		for (String instanceId : instances.keySet()) {
+			Instance instance = Instances.getInstance().getInstance(instanceId);
 			instance.getUniverse().update(interval);
 			result.clear();
 			for (Object object : instance.getObjects().values()) {
-				for (Player player : Instances.getInstance().getPlayers().values()) {
-					// result.add(PhysicsUtility.checkCollision(character.getObject(), "",
-					// object.getObject(), ""));
+				for (Player player : Instances.getInstance().getPlayers(instanceId).values()) {
+					result.add(PhysicsUtility.checkCollision(player.getObject(), "",object.getObject(), ""));
 					// System.out.println(result.get(result.size()-1).length);
 					// objectmove(instance, object, character);
 				}