Final template after changes made v1.1