sorted out diffs