added custom templating