slight mod to the parser