Parser chages to help speed it up