issue 16: polishing