diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java
index 8116b39..231fb9c 100644
--- a/src/main/java/cactusServer/models/CollisionManager.java
+++ b/src/main/java/cactusServer/models/CollisionManager.java
@@ -40,7 +40,7 @@
 			for (Object object : instance.getObjects().values()) {
 				for (Character character : instance.getCharacters().values()) {
 					result.add(PhysicsUtility.checkCollision(character.getObject(), "", object.getObject(), ""));
-					//objectmove(instance, object, character);
+					// objectmove(instance, object, character);
 				}
 			}
 		}
diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java
index fbfc240..fa2344e 100644
--- a/src/main/java/cactusServer/utils/App.java
+++ b/src/main/java/cactusServer/utils/App.java
@@ -34,7 +34,7 @@
 @ApplicationPath("/rest")
 public class App extends ResourceConfig implements Runnable {
 	private ScheduledThreadPoolExecutor task = new ScheduledThreadPoolExecutor(1000);
-	private long lasttime = System.currentTimeMillis();
+	private long lasttime = System.nanoTime();
 
 	public App() {
 		ObjectModelManager.getInstance();
@@ -50,9 +50,9 @@
 	@Override
 	public void run() {
 		// System.out.println("�^�X�N�����s");
-		CollisionManager.getCollision().collisionRun(System.currentTimeMillis() - lasttime);
+		CollisionManager.getCollision().collisionRun(System.nanoTime() - lasttime);
 		removeInactivePlayers();
-		lasttime = System.currentTimeMillis();
+		lasttime = System.nanoTime();
 	}
 
 	public void start(int interval) {