Improved P/R from STL