Latest code, with parse table