some changes in grammar