Client changes

Client changes