Updates and implementation of boostrapper