Updated grammar