Uses SVG pieces now