Rearranged some of the fields