Updated draw mode