Two new areas, some rearranging.