more change to templates