few changes to the template