Make changes to client and server code