A little more restructuring