Nick edited the parser some more