refactored bootstrapping on mac