More drawing changes.