modified the files related to multi_master