Revert "Revert "some modification""

This reverts commit 135ad08c42820c7f72367c2a0006ffec0dddb2b6.