diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java
index 3577036..297ab44 100644
--- a/src/main/java/cactusServer/models/CollisionManager.java
+++ b/src/main/java/cactusServer/models/CollisionManager.java
@@ -47,7 +47,7 @@
 			Instance instance = Instances.getInstance().getInstance(instanceId);
 			instance.getUniverse().update(interval);
 			collisionPlayersObjects(instanceId, instance);
-//			collisionBulletsAndOthers(instanceId, instance);
+			collisionBulletsAndOthers(instanceId, instance);
 		}
 	}
 
@@ -130,7 +130,7 @@
 	}
 
 	private void collisionBulletsAndOthers(String instanceId, Instance instance) {
-//		collisionBulletAndOtherBullets(instance);
+		collisionBulletAndOtherBullets(instance);
 		for (Map.Entry<String, HashMap<String, Bullet>> playersBulletsEntry : instance.getBullets().entrySet()) {
 			String bulletOwnerPlayerId = playersBulletsEntry.getKey();
 			Map<String, Bullet> bulletMap = playersBulletsEntry.getValue();
@@ -138,9 +138,9 @@
 				Bullet bullet = bulletEntry.getValue();
 				if (!bullet.isAlive()) continue;
 				String bulletId = bulletEntry.getKey();
-//				collisionBulletAndPlayers(instanceId, instance, bulletOwnerPlayerId, bulletId, bullet);
+				collisionBulletAndPlayers(instanceId, instance, bulletOwnerPlayerId, bulletId, bullet);
 				if (!bullet.isAlive()) continue;
-//				collisionBulletAndObjects(instance, bulletOwnerPlayerId, bulletId, bullet);
+				collisionBulletAndObjects(instance, bulletOwnerPlayerId, bulletId, bullet);
 			}
 		}
 	}
diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java
index a97048a..9cd1e73 100644
--- a/src/main/java/cactusServer/utils/App.java
+++ b/src/main/java/cactusServer/utils/App.java
@@ -64,7 +64,7 @@
 	public void run() {
 		CollisionManager.getInstance().collisionRun(System.currentTimeMillis() - lasttime);
 		Instances.getInstance().removeInactivePlayers();
-		Instances.getInstance().removeDeadBullets();
+//		Instances.getInstance().removeDeadBullets();
 		lasttime = System.currentTimeMillis();
 	}
 
@@ -91,33 +91,33 @@
 		chara1 = new Character("test2", accountUri, "chara3", new Position3D(), new Quaternion3D(), 0);
 		Instances.getInstance().getInstance("test2").getCharacters().put("chara3", chara1);
 		
-//		// �_�~�[�v���C���[3��
-//		chara1.setPosition(new Position3D(34.5, 23.4, 19));
-//		CameraState cameraState = new CameraState(1.24, new Quaternion3D(), 2.38, 3);
-//		Player player1 = new Player("test1", "chara1", null, null);
-//		Instances.getInstance().getPlayers().put("player1", player1);
-//		Player player2 = new Player("test2", "chara2", cameraState, EmoteType.DUMMY);
-//		Instances.getInstance().getPlayers().put("player2", player2);
-//		Player player3 = new Player("test1","chara1",null,null);
-//		Instances.getInstance().getPlayers().put("player3", player3);
+		// �_�~�[�v���C���[3��
+		chara1.setPosition(new Position3D(34.5, 23.4, 19));
+		CameraState cameraState = new CameraState(1.24, new Quaternion3D(), 2.38, 3);
+		Player player1 = new Player("test1", "chara1", null, null);
+		Instances.getInstance().getPlayers().put("player1", player1);
+		Player player2 = new Player("test2", "chara2", cameraState, EmoteType.DUMMY);
+		Instances.getInstance().getPlayers().put("player2", player2);
+		Player player3 = new Player("test1","chara1",null,null);
+		Instances.getInstance().getPlayers().put("player3", player3);
 		
 		// �_�~�[�I�u�W�F�N�g
 		Instances.getInstance().getInstance("test1").createObject(new Position3D(0, 0, 0), new Velocity3D(),
 				new AngularVelocity3D(), new Quaternion3D(), new Attribute(true, 1), 0);
 		
-//		// �_�~�[�o���b�g
-//		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId1",
-//				new Position3D(50, 50, 50), new Quaternion3D());
-//		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId2",
-//				new Position3D(300, 400, 500), new Quaternion3D());
-//		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId3",
-//				new Position3D(110, 110, 110), new Quaternion3D());
-//		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId4", 
-//				new Position3D(0, 0, 0), new Quaternion3D());
-//		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId5",
-//				new Position3D(300, 400, 500), new Quaternion3D());
-//		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId6",
-//				new Position3D(300, 400, 500), new Quaternion3D());
+		// �_�~�[�o���b�g
+		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId1",
+				new Position3D(50, 50, 50), new Quaternion3D());
+		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId2",
+				new Position3D(300, 400, 500), new Quaternion3D());
+		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId3",
+				new Position3D(110, 110, 110), new Quaternion3D());
+		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId4", 
+				new Position3D(0, 0, 0), new Quaternion3D());
+		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId5",
+				new Position3D(300, 400, 500), new Quaternion3D());
+		Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId6",
+				new Position3D(300, 400, 500), new Quaternion3D());
 		System.out.println("obj");
 	}
 }
\ No newline at end of file