re-building diffs