Added auto-draw feature