reflect move of functions in client.py