Improved grammar to behave more like the previous version