Adding in collisions
merge