Improve and simplify P/R