Reworked grammar to match updated grammar