Modified the devices and clients