added changes to templates