Expanded/revised grammar