Added toggle for drawing