bootstrap mods up to #8