some changes to templates