Fixed collisions!

Fabio's workings