rebuilding savage diffs