made some progress in collision detection