Added output selector