Patch & revert basic