more polishing changes