Organized and updated bootstrapping part