More rearranging and infrastructure