added display, merged