Using the new Painter. Dropped the old stuff.