Update for baremetal