Update with organizate code in the SVG Draw