Updated draw method