added templating