updated grammar and template