few changes in the master