Adding change 3 by client

Long description.