regexp and parser  corrected