Added 'draw' macro