Added more possible forms of display