Update for Client and Server