revamp of the device controller