made some changes to the templating