did more work on collision detection