adding changes to client_lib