Working on the grammar