fixed collisions FINALLY