added jinja
made few changes