Changes to client and server.