more updates to the get_client_data method