Revamped bootstrapping slightly