modify client and server