new ADM templates, slight changes to others