changes in master 2