Rearranged a couple things