Made some changes for Master/Client communication