Modified client and server