change to client lib