modify several changes.