reorganization of core step 1