Update P/R of LWG 2210 according to Jonathan's suggestions