Updated bootstrap routine