changed bootstrap logic