changes in master 1