Work on collision resolution