Changed drawing to be global