more changes to template