synching up
Re-organized bootstrapping design