Modified parser.
Parser passes test.