bootstrap mods up to #3