Updated draw quary