new templates, updated others