merging local changes with changes made by Phillip