changed some templating
changed some templating