Tijs made some changes to the grammar