went back to with_client for now at least