rework on grammar