new version of the parser