changes to p_client?