client updates to match updated two-function API