reverted encapsulation, added display types