changed the server and client