More work on the grammar