Updated build (now with less collisions)