Paul's edits to Display.hs