Modified parsing code.