#25 refactored bootstrapping