Figures: drawFigure() modified.