some changes in master