Improved grammatics