Did work on collision detection