made changes to master