major updates to templates