Rearranged some stuff.