Updated CollisionController