More drawing changes