More evenly split bootstrap method responsibilities, and use new UHDS path