Few modifications on the template