some updates in template