Parsing code modified