Update client and server code for wifi 2way