working on the new parser