Almost done with rearranging.