keep diffs simple