Changed the way of bootsrapping