minor adaptation in templates