More rearranging.