Improved grammer