adding some changes in bootstrapping