bootstrap is added
structure is rearranged