Ordine style collision

Ordine style collision is implemented. Branches should be merged.