Some improvements to collision