Updating to use svg