more work on new parser api