Updated Collision Manager