tightened up the grammar rules