Refactored bootstrap I