few changes in the client class