reorganization of core step 2, done