changed order in device types