make some changes to master