modified a couple parsers