Modified rules for 2013 Fall version of grammar