Modified client to correctly talk to server