Changes to Templates