Collision algo update - one-pass (roughly)