Finished list of changes from Tony