modify the master_server part