Some final polishing