Updated to work with resize and other things that use draw