some further polishing