Improved device selection.