Back to the client library again