update to match latest spec