fixed collision; large multi-system rework