rearranged a couple of sections