Incorporating changes made on the server