Rearranged some things