separated the client library, added a fixed client