Improved P/R from Nico