first draft with the new generated parser