Diffs: make better