changed some templating