Some drawing changes