A little polishing #2.