Polishing according PR's discussion