Adding P/R suggested by STL