minor changes in master-replace