feat(added proper collisions)