adjustments for new cloud backend, new device