Improvement on drawing queue