Updated for devices

Updated for devices