Incorporating changes from client.