with edits for actual pr2