more goto polishing