Collisions improved, collisions almost done