#523: change device type, add new devices