Added proper collisions.