PAPR1 - refactor