PAPR1 refactor