Redo some changes.