A final edit

There should be merge conflicts now