More organization adjustments