changes from the templating system