collisions a bit better