reformatted previous changes to operate more easily with diffs