More changes from the rearranging