Updated for drawing framework.