Last of the changes to Client