Client changes 2