added devices and more gauges