Revert with added functionality