master-server communication implementation update