initial changes on templat