changes in master update 2