rearranged some stuff
bootstrap