more changes made to templates