Revert and redo changes once again