making some changes to master