Added updated templates from Anita