made some changes to templates