Tweaked the bootstrap procedure