Rearranged some stuff