Change the way we pick the output device