some more polishing