Revert "Revert "update parser""

This reverts commit 5b02ef45e1a94cfa2a2adc0546f80db8c0ff4a7c.