More polishing up