Collision detection changes