small changes in client-server