rearranged a bunch of stuff