Merged Jons new Parser