parser enhanced (sjrd comments)