modify the framework for 2nd round work