Ported "orange-and-black-elephant-in-the-room-3"