Nearly identical

Tried to cleverly create a pull request to show all changes, gave up and am merging these.