Rearranged some data