improved device selection