Integrated new parser, need testing