More work on bootloader