Corrected P/R after feedback from Jonathan