More rearranging to make the overstate work