Collision improvements