a bit of polishing...