Worked some more on the collision