Updated to draw data!
Added auto-update data