Many changes... just before big reorganization.