Update for 2nd boot-strap