removed initial templating