Grammar changes
Merged