Collision refactoring
Fixes for new collision