More changes to improve collisions