Improved grammar