minor changes towards template