Collision and Grouping update