Attempting some changes to the grammar