fixed all the collisions