Changes to grammar