greatly upgraded grammar