changed diff order to make copying changes to master easier