Collision updates.
Merged.