first changes in both server and client