diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java
index ec3533c..d1e9a92 100644
--- a/src/main/java/cactusServer/entities/Character.java
+++ b/src/main/java/cactusServer/entities/Character.java
@@ -39,7 +39,7 @@
 		setModelID(modelID);
 		initAreaURI(instanceId);
 		setPrim(new Box());
-		setObject(new Object3D("",prim));
+		setObject(new Object3D("", prim));
 	}
 
 	public String getAccountURI() {
@@ -152,7 +152,7 @@
 		setPosition(position);
 		setAngle(angle);
 		setModelID(modelID);
-//		updateAreaURI();
+		// updateAreaURI();
 	}
 
 	public void update(Position3D position, Quaternion3D angle, String areaURI) {
@@ -178,6 +178,7 @@
 		return itemMap.remove(itemId);
 	}
 
+	@JSONHint(ignore = true)
 	public Primitive getPrim() {
 		return prim;
 	}
@@ -186,6 +187,7 @@
 		this.prim = prim;
 	}
 
+	@JSONHint(ignore = true)
 	public Object3D getObject() {
 		return object;
 	}
diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java
index 0a9c5b0..f3b7e88 100644
--- a/src/main/java/cactusServer/entities/Object.java
+++ b/src/main/java/cactusServer/entities/Object.java
@@ -98,6 +98,7 @@
 		private boolean moveable; // �“�
 		private double cof; // ���C�W��
 
+		@SuppressWarnings("unused")
 		private Attribute() {
 
 		}
diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java
index 183b3a2..4bc378a 100644
--- a/src/main/java/cactusServer/models/CollisionManager.java
+++ b/src/main/java/cactusServer/models/CollisionManager.java
@@ -33,16 +33,15 @@
 		return result;
 	}
 
-	public void collisionRun() {
-		for (Map.Entry<String, Instance> instance : instances.entrySet()) {
+	public void collisionRun(long interval) {
+		for (Instance instance : instances.values()) {
+			instance.getUniverse().update(interval);
 			result.clear();
-			HashMap<String, Object> objects = instance.getValue().getObjects();
-			HashMap<String, Character> characters = instance.getValue().getCharacters();
-			for (Map.Entry<String, Object> object : objects.entrySet()) {
-				for (Map.Entry<String, Character> character : characters.entrySet()) {
-					result.add(PhysicsUtility.checkCollision(character.getValue().getObject(), "",
-							object.getValue().getObject(), ""));
-					objectmove(instance.getValue(), object.getValue(), character.getValue());
+			for (Object object : instance.getObjects().values()) {
+				for (Character character : instance.getCharacters().values()) {
+					result.add(PhysicsUtility.checkCollision(character.getObject(), "", object.getObject(), ""));
+					System.out.println(result.get(result.size()-1).length);
+					// objectmove(instance, object, character);
 				}
 			}
 		}
@@ -55,7 +54,7 @@
 		position.setX(position.getX() + current.length * current.normal.x);
 		position.setY(position.getY() + current.length * current.normal.y);
 		position.setZ(position.getZ() + current.length * current.normal.z);
-		object.setPosition(position);
+
 	}
 
 }
diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index 8837022..659f3bc 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -1,7 +1,5 @@
 package cactusServer.resources;
 
-import java.util.ArrayList;
-
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 
diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java
index 0eec1bc..1a43e61 100644
--- a/src/main/java/cactusServer/utils/App.java
+++ b/src/main/java/cactusServer/utils/App.java
@@ -34,6 +34,7 @@
 @ApplicationPath("/rest")
 public class App extends ResourceConfig implements Runnable {
 	private ScheduledThreadPoolExecutor task = new ScheduledThreadPoolExecutor(1000);
+	private long lasttime = System.nanoTime();
 
 	public App() {
 		ObjectModelManager.getInstance();
@@ -49,8 +50,9 @@
 	@Override
 	public void run() {
 		// System.out.println("�^�X�N�����s");
-		CollisionManager.getCollision().collisionRun();
+		CollisionManager.getCollision().collisionRun(System.nanoTime() - lasttime);
 		removeInactivePlayers();
+		lasttime = System.nanoTime();
 	}
 
 	public void start(int interval) {