Merge from separateParsingAndDisplay
Merge from separateParsingAndDisplay