Added local fix and revert mode