changed to basic templating