Collision refactoring complete