Enh #4: first cut of bootstrap upgrade