Update to use boot and finalize
Switch back to rom from master