Collision test
roll back changes