Update to reflect feedback from prq