More work towards proper collisions