changes in CLient and Server