Some changes in template