added new templates and comments