Improvements on bootstrap