more changes in template