reworked bootstrapping (again)