Separate collect_diffs