Added changes on the client
Added changes on the client