a few changes in template file