Client changes #2