Some changes, added grammar