Updated Files

Changes to the grammar class