Redesigned output selection