Made some changes to collisions