Improved bootstrap