Changed a bit with collisions