update templating to not have to overload