Collision refactored