Added in collisions as well