Updated grammar -again-