More changes required to work on-device