update grammar to reflect current state