refactor & collisions fix