redo some change that deleted from 2 prevoius commits
redo