New version of the parser