second part of re-org