A few  changes to Server and client.