removed Caplin concerns from the templates