Change to support multiple device numbers.