Grammar Revision (part 1)