Added better parsing for display.