Rewrote parser