the diffs are now generated the right way