additional reorganization - adrien