a little more polishing