Improved Collisions

Collisions are now much more efficient!