small changes in device selection