Updated draw system