added master-backup changes