fixed allDevice and add addDevice