changing over to Jinja2