Done changes to templates