Trying to make grammar3 and grammar7 backwards compatible with grammar