finally fixing collisions