Polishing 1.5.2