Borja's commit: collisions