diff --git a/CHANGELOG.md b/CHANGELOG.md
index dafdf499018..c2dca01f18c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,16 @@
 
 ## Unreleased (Breaking)
 
+ * `EIP5805`: The `EIP5805` is the standard EIP for what used to be the `Votes` contract, Now it will be used in all the contracts where `Votes` used to be imported. ([#3638](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3638))
  * `TimelockController`: Changed the role architecture to use `DEFAULT_ADMIN_ROLE` as the admin for all roles, instead of the bespoke `TIMELOCK_ADMIN_ROLE` that was used previously. This aligns with the general recommendation for `AccessControl` and makes the addition of new roles easier. Accordingly, the `admin` parameter and timelock will now be granted `DEFAULT_ADMIN_ROLE` instead of `TIMELOCK_ADMIN_ROLE`. ([#3799](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3799))
 
+
 ## Unreleased
 
  * `ReentrancyGuard`: Add a `_reentrancyGuardEntered` function to expose the guard status. ([#3714](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3714))
  * `ERC20Votes`: optimize by using unchecked arithmetic. ([#3748](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3748))
  * `Initializable`: optimize `_disableInitializers` by using `!=` instead of `<`. ([#3787](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3787))
+ * `Nonces`: This is a new contract to keep track of nonces and substitute the `_nonces` storage variable inside `Votes` contract. ([#3638](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3638))
 
 ### Deprecations
 
diff --git a/contracts/governance/extensions/GovernorVotes.sol b/contracts/governance/extensions/GovernorVotes.sol
index b328c25d13d..2ea3a3241e1 100644
--- a/contracts/governance/extensions/GovernorVotes.sol
+++ b/contracts/governance/extensions/GovernorVotes.sol
@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "../Governor.sol";
-import "../utils/IVotes.sol";
+import "../utils/IEIP5805.sol";
 
 /**
  * @dev Extension of {Governor} for voting weight extraction from an {ERC20Votes} token, or since v4.5 an {ERC721Votes} token.
@@ -12,9 +12,9 @@ import "../utils/IVotes.sol";
  * _Available since v4.3._
  */
 abstract contract GovernorVotes is Governor {
-    IVotes public immutable token;
+    IEIP5805 public immutable token;
 
-    constructor(IVotes tokenAddress) {
+    constructor(IEIP5805 tokenAddress) {
         token = tokenAddress;
     }
 
diff --git a/contracts/governance/utils/Votes.sol b/contracts/governance/utils/EIP5805.sol
similarity index 71%
rename from contracts/governance/utils/Votes.sol
rename to contracts/governance/utils/EIP5805.sol
index f763589c6ee..f53a43be2c1 100644
--- a/contracts/governance/utils/Votes.sol
+++ b/contracts/governance/utils/EIP5805.sol
@@ -1,15 +1,16 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.6.0) (governance/utils/Votes.sol)
 pragma solidity ^0.8.0;
 
 import "../../utils/Context.sol";
 import "../../utils/Counters.sol";
 import "../../utils/Checkpoints.sol";
 import "../../utils/cryptography/EIP712.sol";
-import "./IVotes.sol";
+import "./IEIP5805.sol";
 
 /**
- * @dev This is a base abstract contract that tracks voting units, which are a measure of voting power that can be
+ * @dev Core implementation of EIP-5805
+ *
+ * This is a base abstract contract that tracks voting units, which are a measure of voting power that can be
  * transferred, and provides a system of vote delegation, where an account can delegate its voting units to a sort of
  * "representative" that will pool delegated voting units from different accounts and can then use it to vote in
  * decisions. In fact, voting units _must_ be delegated in order to count as actual votes, and an account has to
@@ -18,29 +19,33 @@ import "./IVotes.sol";
  * This contract is often combined with a token contract such that voting units correspond to token units. For an
  * example, see {ERC721Votes}.
  *
- * The full history of delegate votes is tracked on-chain so that governance protocols can consider votes as distributed
- * at a particular block number to protect against flash loans and double voting. The opt-in delegate system makes the
- * cost of this history tracking optional.
+ * The full history of delegate votes is tracked on-chain so that governance protocols can consider votes as
+ * distributed at a particular timestamp to protect against flash loans and double voting. The opt-in delegate system
+ * makes the cost of this history tracking optional.
  *
  * When using this module the derived contract must implement {_getVotingUnits} (for example, make it return
  * {ERC721-balanceOf}), and can use {_transferVotingUnits} to track a change in the distribution of those units (in the
  * previous example, it would be included in {ERC721-_beforeTokenTransfer}).
- *
- * _Available since v4.5._
  */
-abstract contract Votes is IVotes, Context, EIP712 {
-    using Checkpoints for Checkpoints.History;
+abstract contract EIP5805 is IEIP5805, Context, EIP712 {
+    using Checkpoints for Checkpoints.Trace224;
     using Counters for Counters.Counter;
 
     bytes32 private constant _DELEGATION_TYPEHASH =
         keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
 
     mapping(address => address) private _delegation;
-    mapping(address => Checkpoints.History) private _delegateCheckpoints;
-    Checkpoints.History private _totalCheckpoints;
-
+    mapping(address => Checkpoints.Trace224) private _delegateCheckpoints;
+    Checkpoints.Trace224 private _totalCheckpoints;
     mapping(address => Counters.Counter) private _nonces;
 
+    /**
+     * @dev Return the current timestamp, this can be overridden to use `block.timestamp` or any other mechanism
+     */
+    function clock() public view virtual override returns (uint256) {
+        return block.number;
+    }
+
     /**
      * @dev Returns the current amount of votes that `account` has.
      */
@@ -49,18 +54,20 @@ abstract contract Votes is IVotes, Context, EIP712 {
     }
 
     /**
-     * @dev Returns the amount of votes that `account` had at the end of a past block (`blockNumber`).
+     * @dev Returns the amount of votes that `account` had at the end of a past timepoint (`timepoint`).
      *
      * Requirements:
      *
-     * - `blockNumber` must have been already mined
+     * - `timepoint` must have been already mined
      */
-    function getPastVotes(address account, uint256 blockNumber) public view virtual override returns (uint256) {
-        return _delegateCheckpoints[account].getAtProbablyRecentBlock(blockNumber);
+    function getPastVotes(address account, uint256 timepoint) public view virtual override returns (uint256) {
+        require(timepoint < clock(), "Checkpoints: invalid past lookup");
+        // TODO: optimistic lookup
+        return _delegateCheckpoints[account].upperLookup(SafeCast.toUint32(timepoint));
     }
 
     /**
-     * @dev Returns the total supply of votes available at the end of a past block (`blockNumber`).
+     * @dev Returns the total supply of votes available at the end of a past timepoint (`timepoint`).
      *
      * NOTE: This value is the sum of all available votes, which is not necessarily the sum of all delegated votes.
      * Votes that have not been delegated are still part of total supply, even though they would not participate in a
@@ -68,11 +75,12 @@ abstract contract Votes is IVotes, Context, EIP712 {
      *
      * Requirements:
      *
-     * - `blockNumber` must have been already mined
+     * - `timepoint` must have been already mined
      */
-    function getPastTotalSupply(uint256 blockNumber) public view virtual override returns (uint256) {
-        require(blockNumber < block.number, "Votes: block not yet mined");
-        return _totalCheckpoints.getAtProbablyRecentBlock(blockNumber);
+    function getPastTotalSupply(uint256 timepoint) public view virtual override returns (uint256) {
+        require(timepoint < clock(), "Checkpoints: invalid past lookup");
+        // TODO: optimistic lookup
+        return _totalCheckpoints.upperLookup(SafeCast.toUint32(timepoint));
     }
 
     /**
@@ -142,10 +150,10 @@ abstract contract Votes is IVotes, Context, EIP712 {
         uint256 amount
     ) internal virtual {
         if (from == address(0)) {
-            _totalCheckpoints.push(_add, amount);
+            _totalCheckpoints.push(SafeCast.toUint32(clock()), _add, amount);
         }
         if (to == address(0)) {
-            _totalCheckpoints.push(_subtract, amount);
+            _totalCheckpoints.push(SafeCast.toUint32(clock()), _subtract, amount);
         }
         _moveDelegateVotes(delegates(from), delegates(to), amount);
     }
@@ -160,22 +168,30 @@ abstract contract Votes is IVotes, Context, EIP712 {
     ) private {
         if (from != to && amount > 0) {
             if (from != address(0)) {
-                (uint256 oldValue, uint256 newValue) = _delegateCheckpoints[from].push(_subtract, amount);
+                (uint256 oldValue, uint256 newValue) = _delegateCheckpoints[from].push(
+                    SafeCast.toUint32(clock()),
+                    _subtract,
+                    amount
+                );
                 emit DelegateVotesChanged(from, oldValue, newValue);
             }
             if (to != address(0)) {
-                (uint256 oldValue, uint256 newValue) = _delegateCheckpoints[to].push(_add, amount);
+                (uint256 oldValue, uint256 newValue) = _delegateCheckpoints[to].push(
+                    SafeCast.toUint32(clock()),
+                    _add,
+                    amount
+                );
                 emit DelegateVotesChanged(to, oldValue, newValue);
             }
         }
     }
 
-    function _add(uint256 a, uint256 b) private pure returns (uint256) {
-        return a + b;
+    function _add(uint224 a, uint256 b) private pure returns (uint224) {
+        return SafeCast.toUint224(a + b);
     }
 
-    function _subtract(uint256 a, uint256 b) private pure returns (uint256) {
-        return a - b;
+    function _subtract(uint224 a, uint256 b) private pure returns (uint224) {
+        return SafeCast.toUint224(a - b);
     }
 
     /**
@@ -196,14 +212,6 @@ abstract contract Votes is IVotes, Context, EIP712 {
         return _nonces[owner].current();
     }
 
-    /**
-     * @dev Returns the contract's {EIP712} domain separator.
-     */
-    // solhint-disable-next-line func-name-mixedcase
-    function DOMAIN_SEPARATOR() external view returns (bytes32) {
-        return _domainSeparatorV4();
-    }
-
     /**
      * @dev Must return the voting units held by an account.
      */
diff --git a/contracts/governance/utils/IVotes.sol b/contracts/governance/utils/IEIP5805.sol
similarity index 85%
rename from contracts/governance/utils/IVotes.sol
rename to contracts/governance/utils/IEIP5805.sol
index 6317d7752e0..30213cba707 100644
--- a/contracts/governance/utils/IVotes.sol
+++ b/contracts/governance/utils/IEIP5805.sol
@@ -1,13 +1,10 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.5.0) (governance/utils/IVotes.sol)
 pragma solidity ^0.8.0;
 
 /**
- * @dev Common interface for {ERC20Votes}, {ERC721Votes}, and other {Votes}-enabled contracts.
- *
- * _Available since v4.5._
+ * @dev EIP-5805 interface: common interface for {ERC20Votes}, {ERC721Votes}, and other {Votes}-enabled contracts.
  */
-interface IVotes {
+interface IEIP5805 {
     /**
      * @dev Emitted when an account changes their delegate.
      */
@@ -18,6 +15,11 @@ interface IVotes {
      */
     event DelegateVotesChanged(address indexed delegate, uint256 previousBalance, uint256 newBalance);
 
+    /**
+     * @dev Return the current timestamp, this can be overridden to use `block.timestamp` or any other mechanism
+     */
+    function clock() external view returns (uint256);
+
     /**
      * @dev Returns the current amount of votes that `account` has.
      */
diff --git a/contracts/mocks/VotesMock.sol b/contracts/mocks/EIP5805Mock.sol
similarity index 81%
rename from contracts/mocks/VotesMock.sol
rename to contracts/mocks/EIP5805Mock.sol
index f888490da72..3957b67352c 100644
--- a/contracts/mocks/VotesMock.sol
+++ b/contracts/mocks/EIP5805Mock.sol
@@ -2,14 +2,19 @@
 
 pragma solidity ^0.8.0;
 
-import "../governance/utils/Votes.sol";
+import "../governance/utils/EIP5805.sol";
 
-contract VotesMock is Votes {
+contract EIP5805Mock is EIP5805 {
     mapping(address => uint256) private _balances;
     mapping(uint256 => address) private _owners;
 
     constructor(string memory name) EIP712(name, "1") {}
 
+    // solhint-disable-next-line func-name-mixedcase
+    function DOMAIN_SEPARATOR() external view returns (bytes32) {
+        return _domainSeparatorV4();
+    }
+
     function getTotalSupply() public view returns (uint256) {
         return _getTotalSupply();
     }
diff --git a/contracts/mocks/ERC721VotesMock.sol b/contracts/mocks/ERC721VotesMock.sol
index acb51ebfbe1..d81575e269e 100644
--- a/contracts/mocks/ERC721VotesMock.sol
+++ b/contracts/mocks/ERC721VotesMock.sol
@@ -7,6 +7,11 @@ import "../token/ERC721/extensions/ERC721Votes.sol";
 contract ERC721VotesMock is ERC721Votes {
     constructor(string memory name, string memory symbol) ERC721(name, symbol) EIP712(name, "1") {}
 
+    // solhint-disable-next-line func-name-mixedcase
+    function DOMAIN_SEPARATOR() external view returns (bytes32) {
+        return _domainSeparatorV4();
+    }
+
     function getTotalSupply() public view returns (uint256) {
         return _getTotalSupply();
     }
diff --git a/contracts/mocks/GovernorMock.sol b/contracts/mocks/GovernorMock.sol
index bd2de338a92..ad234a68c1a 100644
--- a/contracts/mocks/GovernorMock.sol
+++ b/contracts/mocks/GovernorMock.sol
@@ -15,7 +15,7 @@ contract GovernorMock is
 {
     constructor(
         string memory name_,
-        IVotes token_,
+        IEIP5805 token_,
         uint256 votingDelay_,
         uint256 votingPeriod_,
         uint256 quorumNumerator_
diff --git a/contracts/mocks/GovernorPreventLateQuorumMock.sol b/contracts/mocks/GovernorPreventLateQuorumMock.sol
index d868ab22b62..9aa94b22d04 100644
--- a/contracts/mocks/GovernorPreventLateQuorumMock.sol
+++ b/contracts/mocks/GovernorPreventLateQuorumMock.sol
@@ -17,7 +17,7 @@ contract GovernorPreventLateQuorumMock is
 
     constructor(
         string memory name_,
-        IVotes token_,
+        IEIP5805 token_,
         uint256 votingDelay_,
         uint256 votingPeriod_,
         uint256 quorum_,
diff --git a/contracts/mocks/GovernorTimelockCompoundMock.sol b/contracts/mocks/GovernorTimelockCompoundMock.sol
index becc72a06ef..586de070551 100644
--- a/contracts/mocks/GovernorTimelockCompoundMock.sol
+++ b/contracts/mocks/GovernorTimelockCompoundMock.sol
@@ -15,7 +15,7 @@ contract GovernorTimelockCompoundMock is
 {
     constructor(
         string memory name_,
-        IVotes token_,
+        IEIP5805 token_,
         uint256 votingDelay_,
         uint256 votingPeriod_,
         ICompoundTimelock timelock_,
diff --git a/contracts/mocks/GovernorTimelockControlMock.sol b/contracts/mocks/GovernorTimelockControlMock.sol
index ca412d1ca60..13290e8b452 100644
--- a/contracts/mocks/GovernorTimelockControlMock.sol
+++ b/contracts/mocks/GovernorTimelockControlMock.sol
@@ -15,7 +15,7 @@ contract GovernorTimelockControlMock is
 {
     constructor(
         string memory name_,
-        IVotes token_,
+        IEIP5805 token_,
         uint256 votingDelay_,
         uint256 votingPeriod_,
         TimelockController timelock_,
diff --git a/contracts/mocks/GovernorVoteMock.sol b/contracts/mocks/GovernorVoteMock.sol
index 60a3d41355e..c8e17498e75 100644
--- a/contracts/mocks/GovernorVoteMock.sol
+++ b/contracts/mocks/GovernorVoteMock.sol
@@ -6,7 +6,7 @@ import "../governance/extensions/GovernorCountingSimple.sol";
 import "../governance/extensions/GovernorVotes.sol";
 
 contract GovernorVoteMocks is GovernorVotes, GovernorCountingSimple {
-    constructor(string memory name_, IVotes token_) Governor(name_) GovernorVotes(token_) {}
+    constructor(string memory name_, IEIP5805 token_) Governor(name_) GovernorVotes(token_) {}
 
     function quorum(uint256) public pure override returns (uint256) {
         return 0;
diff --git a/contracts/mocks/GovernorWithParamsMock.sol b/contracts/mocks/GovernorWithParamsMock.sol
index b5da8906a81..8ee58360e7b 100644
--- a/contracts/mocks/GovernorWithParamsMock.sol
+++ b/contracts/mocks/GovernorWithParamsMock.sol
@@ -8,7 +8,7 @@ import "../governance/extensions/GovernorVotes.sol";
 contract GovernorWithParamsMock is GovernorVotes, GovernorCountingSimple {
     event CountParams(uint256 uintParam, string strParam);
 
-    constructor(string memory name_, IVotes token_) Governor(name_) GovernorVotes(token_) {}
+    constructor(string memory name_, IEIP5805 token_) Governor(name_) GovernorVotes(token_) {}
 
     function quorum(uint256) public pure override returns (uint256) {
         return 0;
diff --git a/contracts/mocks/NoncesImpl.sol b/contracts/mocks/NoncesImpl.sol
new file mode 100644
index 00000000000..41b913c811d
--- /dev/null
+++ b/contracts/mocks/NoncesImpl.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "../utils/Nonces.sol";
+
+contract NoncesImpl is Nonces {
+    function useNonce(address owner) public {
+        super._useNonce(owner);
+    }
+}
diff --git a/contracts/mocks/wizard/MyGovernor1.sol b/contracts/mocks/wizard/MyGovernor1.sol
index a80d8400c5e..de1ff2c4ed0 100644
--- a/contracts/mocks/wizard/MyGovernor1.sol
+++ b/contracts/mocks/wizard/MyGovernor1.sol
@@ -14,7 +14,7 @@ contract MyGovernor1 is
     GovernorVotesQuorumFraction,
     GovernorCountingSimple
 {
-    constructor(IVotes _token, TimelockController _timelock)
+    constructor(IEIP5805 _token, TimelockController _timelock)
         Governor("MyGovernor")
         GovernorVotes(_token)
         GovernorVotesQuorumFraction(4)
diff --git a/contracts/mocks/wizard/MyGovernor2.sol b/contracts/mocks/wizard/MyGovernor2.sol
index 34c608c5cc2..e02337a9e3b 100644
--- a/contracts/mocks/wizard/MyGovernor2.sol
+++ b/contracts/mocks/wizard/MyGovernor2.sol
@@ -16,7 +16,7 @@ contract MyGovernor2 is
     GovernorVotesQuorumFraction,
     GovernorCountingSimple
 {
-    constructor(IVotes _token, TimelockController _timelock)
+    constructor(IEIP5805 _token, TimelockController _timelock)
         Governor("MyGovernor")
         GovernorVotes(_token)
         GovernorVotesQuorumFraction(4)
diff --git a/contracts/mocks/wizard/MyGovernor3.sol b/contracts/mocks/wizard/MyGovernor3.sol
index 70e4e87f046..7f16a0f4d5d 100644
--- a/contracts/mocks/wizard/MyGovernor3.sol
+++ b/contracts/mocks/wizard/MyGovernor3.sol
@@ -14,7 +14,7 @@ contract MyGovernor is
     GovernorVotes,
     GovernorVotesQuorumFraction
 {
-    constructor(IVotes _token, TimelockController _timelock)
+    constructor(IEIP5805 _token, TimelockController _timelock)
         Governor("MyGovernor")
         GovernorVotes(_token)
         GovernorVotesQuorumFraction(4)
diff --git a/contracts/token/ERC20/extensions/ERC20Votes.sol b/contracts/token/ERC20/extensions/ERC20Votes.sol
index bf319c26f84..aea1e2e9944 100644
--- a/contracts/token/ERC20/extensions/ERC20Votes.sol
+++ b/contracts/token/ERC20/extensions/ERC20Votes.sol
@@ -4,10 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "./ERC20Permit.sol";
-import "../../../utils/math/Math.sol";
-import "../../../governance/utils/IVotes.sol";
-import "../../../utils/math/SafeCast.sol";
-import "../../../utils/cryptography/ECDSA.sol";
+import "../../../governance/utils/EIP5805.sol";
 
 /**
  * @dev Extension of ERC20 to support Compound-like voting and delegation. This version is more generic than Compound's,
@@ -24,257 +21,40 @@ import "../../../utils/cryptography/ECDSA.sol";
  *
  * _Available since v4.2._
  */
-abstract contract ERC20Votes is IVotes, ERC20Permit {
-    struct Checkpoint {
-        uint32 fromBlock;
-        uint224 votes;
+abstract contract ERC20Votes is EIP5805, ERC20Permit {
+    function nonces(address owner) public view virtual override(ERC20Permit, EIP5805) returns (uint256) {
+        return super.nonces(owner);
     }
 
-    bytes32 private constant _DELEGATION_TYPEHASH =
-        keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
-
-    mapping(address => address) private _delegates;
-    mapping(address => Checkpoint[]) private _checkpoints;
-    Checkpoint[] private _totalSupplyCheckpoints;
-
-    /**
-     * @dev Get the `pos`-th checkpoint for `account`.
-     */
-    function checkpoints(address account, uint32 pos) public view virtual returns (Checkpoint memory) {
-        return _checkpoints[account][pos];
-    }
-
-    /**
-     * @dev Get number of checkpoints for `account`.
-     */
-    function numCheckpoints(address account) public view virtual returns (uint32) {
-        return SafeCast.toUint32(_checkpoints[account].length);
-    }
-
-    /**
-     * @dev Get the address `account` is currently delegating to.
-     */
-    function delegates(address account) public view virtual override returns (address) {
-        return _delegates[account];
-    }
-
-    /**
-     * @dev Gets the current votes balance for `account`
-     */
-    function getVotes(address account) public view virtual override returns (uint256) {
-        uint256 pos = _checkpoints[account].length;
-        unchecked {
-            return pos == 0 ? 0 : _checkpoints[account][pos - 1].votes;
-        }
-    }
-
-    /**
-     * @dev Retrieve the number of votes for `account` at the end of `blockNumber`.
-     *
-     * Requirements:
-     *
-     * - `blockNumber` must have been already mined
-     */
-    function getPastVotes(address account, uint256 blockNumber) public view virtual override returns (uint256) {
-        require(blockNumber < block.number, "ERC20Votes: block not yet mined");
-        return _checkpointsLookup(_checkpoints[account], blockNumber);
-    }
-
-    /**
-     * @dev Retrieve the `totalSupply` at the end of `blockNumber`. Note, this value is the sum of all balances.
-     * It is NOT the sum of all the delegated votes!
-     *
-     * Requirements:
-     *
-     * - `blockNumber` must have been already mined
-     */
-    function getPastTotalSupply(uint256 blockNumber) public view virtual override returns (uint256) {
-        require(blockNumber < block.number, "ERC20Votes: block not yet mined");
-        return _checkpointsLookup(_totalSupplyCheckpoints, blockNumber);
-    }
-
-    /**
-     * @dev Lookup a value in a list of (sorted) checkpoints.
-     */
-    function _checkpointsLookup(Checkpoint[] storage ckpts, uint256 blockNumber) private view returns (uint256) {
-        // We run a binary search to look for the earliest checkpoint taken after `blockNumber`.
-        //
-        // Initially we check if the block is recent to narrow the search range.
-        // During the loop, the index of the wanted checkpoint remains in the range [low-1, high).
-        // With each iteration, either `low` or `high` is moved towards the middle of the range to maintain the invariant.
-        // - If the middle checkpoint is after `blockNumber`, we look in [low, mid)
-        // - If the middle checkpoint is before or equal to `blockNumber`, we look in [mid+1, high)
-        // Once we reach a single value (when low == high), we've found the right checkpoint at the index high-1, if not
-        // out of bounds (in which case we're looking too far in the past and the result is 0).
-        // Note that if the latest checkpoint available is exactly for `blockNumber`, we end up with an index that is
-        // past the end of the array, so we technically don't find a checkpoint after `blockNumber`, but it works out
-        // the same.
-        uint256 length = ckpts.length;
-
-        uint256 low = 0;
-        uint256 high = length;
-
-        if (length > 5) {
-            uint256 mid = length - Math.sqrt(length);
-            if (_unsafeAccess(ckpts, mid).fromBlock > blockNumber) {
-                high = mid;
-            } else {
-                low = mid + 1;
-            }
-        }
-
-        while (low < high) {
-            uint256 mid = Math.average(low, high);
-            if (_unsafeAccess(ckpts, mid).fromBlock > blockNumber) {
-                high = mid;
-            } else {
-                low = mid + 1;
-            }
-        }
-
-        unchecked {
-            return high == 0 ? 0 : _unsafeAccess(ckpts, high - 1).votes;
-        }
-    }
-
-    /**
-     * @dev Delegate votes from the sender to `delegatee`.
-     */
-    function delegate(address delegatee) public virtual override {
-        _delegate(_msgSender(), delegatee);
-    }
-
-    /**
-     * @dev Delegates votes from signer to `delegatee`
-     */
-    function delegateBySig(
-        address delegatee,
-        uint256 nonce,
-        uint256 expiry,
-        uint8 v,
-        bytes32 r,
-        bytes32 s
-    ) public virtual override {
-        require(block.timestamp <= expiry, "ERC20Votes: signature expired");
-        address signer = ECDSA.recover(
-            _hashTypedDataV4(keccak256(abi.encode(_DELEGATION_TYPEHASH, delegatee, nonce, expiry))),
-            v,
-            r,
-            s
-        );
-        require(nonce == _useNonce(signer), "ERC20Votes: invalid nonce");
-        _delegate(signer, delegatee);
-    }
-
-    /**
-     * @dev Maximum token supply. Defaults to `type(uint224).max` (2^224^ - 1).
-     */
-    function _maxSupply() internal view virtual returns (uint224) {
-        return type(uint224).max;
+    function _useNonce(address owner) internal virtual override(ERC20Permit, EIP5805) returns (uint256) {
+        return super._useNonce(owner);
     }
 
-    /**
-     * @dev Snapshots the totalSupply after it has been increased.
-     */
     function _mint(address account, uint256 amount) internal virtual override {
+        require(totalSupply() + amount <= _maxSupply(), "ERC20Votes: total supply risks overflowing votes");
         super._mint(account, amount);
-        require(totalSupply() <= _maxSupply(), "ERC20Votes: total supply risks overflowing votes");
-
-        _writeCheckpoint(_totalSupplyCheckpoints, _add, amount);
-    }
-
-    /**
-     * @dev Snapshots the totalSupply after it has been decreased.
-     */
-    function _burn(address account, uint256 amount) internal virtual override {
-        super._burn(account, amount);
-
-        _writeCheckpoint(_totalSupplyCheckpoints, _subtract, amount);
     }
 
-    /**
-     * @dev Move voting power when tokens are transferred.
-     *
-     * Emits a {IVotes-DelegateVotesChanged} event.
-     */
     function _afterTokenTransfer(
         address from,
         address to,
         uint256 amount
     ) internal virtual override {
+        _transferVotingUnits(from, to, amount);
         super._afterTokenTransfer(from, to, amount);
-
-        _moveVotingPower(delegates(from), delegates(to), amount);
     }
 
     /**
-     * @dev Change delegation for `delegator` to `delegatee`.
-     *
-     * Emits events {IVotes-DelegateChanged} and {IVotes-DelegateVotesChanged}.
+     * @dev Returns the balance of `account`.
      */
-    function _delegate(address delegator, address delegatee) internal virtual {
-        address currentDelegate = delegates(delegator);
-        uint256 delegatorBalance = balanceOf(delegator);
-        _delegates[delegator] = delegatee;
-
-        emit DelegateChanged(delegator, currentDelegate, delegatee);
-
-        _moveVotingPower(currentDelegate, delegatee, delegatorBalance);
-    }
-
-    function _moveVotingPower(
-        address src,
-        address dst,
-        uint256 amount
-    ) private {
-        if (src != dst && amount > 0) {
-            if (src != address(0)) {
-                (uint256 oldWeight, uint256 newWeight) = _writeCheckpoint(_checkpoints[src], _subtract, amount);
-                emit DelegateVotesChanged(src, oldWeight, newWeight);
-            }
-
-            if (dst != address(0)) {
-                (uint256 oldWeight, uint256 newWeight) = _writeCheckpoint(_checkpoints[dst], _add, amount);
-                emit DelegateVotesChanged(dst, oldWeight, newWeight);
-            }
-        }
-    }
-
-    function _writeCheckpoint(
-        Checkpoint[] storage ckpts,
-        function(uint256, uint256) view returns (uint256) op,
-        uint256 delta
-    ) private returns (uint256 oldWeight, uint256 newWeight) {
-        uint256 pos = ckpts.length;
-
-        unchecked {
-            Checkpoint memory oldCkpt = pos == 0 ? Checkpoint(0, 0) : _unsafeAccess(ckpts, pos - 1);
-
-            oldWeight = oldCkpt.votes;
-            newWeight = op(oldWeight, delta);
-
-            if (pos > 0 && oldCkpt.fromBlock == block.number) {
-                _unsafeAccess(ckpts, pos - 1).votes = SafeCast.toUint224(newWeight);
-            } else {
-                ckpts.push(
-                    Checkpoint({fromBlock: SafeCast.toUint32(block.number), votes: SafeCast.toUint224(newWeight)})
-                );
-            }
-        }
+    function _getVotingUnits(address account) internal view virtual override returns (uint256) {
+        return balanceOf(account);
     }
 
-    function _add(uint256 a, uint256 b) private pure returns (uint256) {
-        return a + b;
-    }
-
-    function _subtract(uint256 a, uint256 b) private pure returns (uint256) {
-        return a - b;
-    }
-
-    function _unsafeAccess(Checkpoint[] storage ckpts, uint256 pos) private pure returns (Checkpoint storage result) {
-        assembly {
-            mstore(0, ckpts.slot)
-            result.slot := add(keccak256(0, 0x20), pos)
-        }
+    /**
+     * @dev Maximum token supply. Defaults to `type(uint224).max` (2^224^ - 1).
+     */
+    function _maxSupply() internal view virtual returns (uint224) {
+        return type(uint224).max;
     }
 }
diff --git a/contracts/token/ERC721/extensions/ERC721Votes.sol b/contracts/token/ERC721/extensions/ERC721Votes.sol
index 44433ca8c0a..4e0548cf0ce 100644
--- a/contracts/token/ERC721/extensions/ERC721Votes.sol
+++ b/contracts/token/ERC721/extensions/ERC721Votes.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 import "../ERC721.sol";
-import "../../../governance/utils/Votes.sol";
+import "../../../governance/utils/EIP5805.sol";
 
 /**
  * @dev Extension of ERC721 to support voting and delegation as implemented by {Votes}, where each individual NFT counts
@@ -15,7 +15,7 @@ import "../../../governance/utils/Votes.sol";
  *
  * _Available since v4.5._
  */
-abstract contract ERC721Votes is ERC721, Votes {
+abstract contract ERC721Votes is ERC721, EIP5805 {
     /**
      * @dev See {ERC721-_afterTokenTransfer}. Adjusts votes when tokens are transferred.
      *
diff --git a/contracts/utils/Checkpoints.sol b/contracts/utils/Checkpoints.sol
index 81a8b5d5a17..39303913b84 100644
--- a/contracts/utils/Checkpoints.sol
+++ b/contracts/utils/Checkpoints.sol
@@ -234,6 +234,21 @@ library Checkpoints {
         return _insert(self._checkpoints, key, value);
     }
 
+    /**
+     * @dev Pushes a value onto a History, by updating the latest value using binary operation `op`. The new value will
+     * be set to `op(latest, delta)`.
+     *
+     * Returns previous value and new value.
+     */
+    function push(
+        Trace224 storage self,
+        uint32 key,
+        function(uint224, uint256) view returns (uint224) op,
+        uint256 delta
+    ) internal returns (uint256, uint256) {
+        return push(self, key, op(latest(self), delta));
+    }
+
     /**
      * @dev Returns the value in the oldest checkpoint with key greater or equal than the search key, or zero if there is none.
      */
@@ -399,6 +414,21 @@ library Checkpoints {
         return _insert(self._checkpoints, key, value);
     }
 
+    /**
+     * @dev Pushes a value onto a History, by updating the latest value using binary operation `op`. The new value will
+     * be set to `op(latest, delta)`.
+     *
+     * Returns previous value and new value.
+     */
+    function push(
+        Trace160 storage self,
+        uint96 key,
+        function(uint160, uint256) view returns (uint160) op,
+        uint256 delta
+    ) internal returns (uint256, uint256) {
+        return push(self, key, op(latest(self), delta));
+    }
+
     /**
      * @dev Returns the value in the oldest checkpoint with key greater or equal than the search key, or zero if there is none.
      */
diff --git a/contracts/utils/Nonces.sol b/contracts/utils/Nonces.sol
new file mode 100644
index 00000000000..3176c8faedb
--- /dev/null
+++ b/contracts/utils/Nonces.sol
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import "./Counters.sol";
+
+/**
+ * @dev Todo
+ */
+abstract contract Nonces {
+    using Counters for Counters.Counter;
+
+    mapping(address => Counters.Counter) private _nonces;
+
+    /**
+     * @dev Returns an address nonce.
+     */
+    function nonces(address owner) public view virtual returns (uint256) {
+        return _nonces[owner].current();
+    }
+
+    /**
+     * @dev Consumes a nonce.
+     *
+     * Returns the current value and increments nonce.
+     */
+    function _useNonce(address owner) internal virtual returns (uint256 current) {
+        Counters.Counter storage nonce = _nonces[owner];
+        current = nonce.current();
+        nonce.increment();
+    }
+}
diff --git a/scripts/generate/templates/Checkpoints.js b/scripts/generate/templates/Checkpoints.js
index b78ed5cebb0..05e0ab448a2 100644
--- a/scripts/generate/templates/Checkpoints.js
+++ b/scripts/generate/templates/Checkpoints.js
@@ -45,6 +45,21 @@ function push(
     return _insert(self.${opts.checkpointFieldName}, key, value);
 }
 
+/**
+ * @dev Pushes a value onto a History, by updating the latest value using binary operation \`op\`. The new value will
+ * be set to \`op(latest, delta)\`.
+ *
+ * Returns previous value and new value.
+ */
+function push(
+    ${opts.historyTypeName} storage self,
+    ${opts.keyTypeName} key,
+    function(${opts.valueTypeName}, uint256) view returns (${opts.valueTypeName}) op,
+    uint256 delta
+) internal returns (uint256, uint256) {
+    return push(self, key, op(latest(self), delta));
+}
+
 /**
  * @dev Returns the value in the oldest checkpoint with key greater or equal than the search key, or zero if there is none.
  */
diff --git a/test/governance/utils/Votes.behavior.js b/test/governance/utils/Votes.behavior.js
index aee227bdba0..bd14c8f12a2 100644
--- a/test/governance/utils/Votes.behavior.js
+++ b/test/governance/utils/Votes.behavior.js
@@ -236,7 +236,7 @@ function shouldBehaveLikeVotes () {
       it('reverts if block number >= current block', async function () {
         await expectRevert(
           this.votes.getPastTotalSupply(5e10),
-          'block not yet mined',
+          'Checkpoints: invalid past lookup',
         );
       });
 
@@ -308,7 +308,7 @@ function shouldBehaveLikeVotes () {
         it('reverts if block number >= current block', async function () {
           await expectRevert(
             this.votes.getPastVotes(this.account2, 5e10),
-            'block not yet mined',
+            'Checkpoints: invalid past lookup',
           );
         });
 
diff --git a/test/governance/utils/Votes.test.js b/test/governance/utils/Votes.test.js
index 32b7d1dca57..ccd1ce4893d 100644
--- a/test/governance/utils/Votes.test.js
+++ b/test/governance/utils/Votes.test.js
@@ -6,7 +6,7 @@ const {
   shouldBehaveLikeVotes,
 } = require('./Votes.behavior');
 
-const Votes = artifacts.require('VotesMock');
+const Votes = artifacts.require('EIP5805Mock');
 
 contract('Votes', function (accounts) {
   const [ account1, account2, account3 ] = accounts;
@@ -29,7 +29,7 @@ contract('Votes', function (accounts) {
     it('reverts if block number >= current block', async function () {
       await expectRevert(
         this.votes.getPastTotalSupply(this.tx3.receipt.blockNumber + 1),
-        'Votes: block not yet mined',
+        'Checkpoints: invalid past lookup',
       );
     });
 
diff --git a/test/token/ERC20/extensions/ERC20Votes.test.js b/test/token/ERC20/extensions/ERC20Votes.test.js
index 9d3160bd18c..70f1ff001e8 100644
--- a/test/token/ERC20/extensions/ERC20Votes.test.js
+++ b/test/token/ERC20/extensions/ERC20Votes.test.js
@@ -62,7 +62,7 @@ contract('ERC20Votes', function (accounts) {
       await this.token.mint(holder, 1);
     }
     const block = await web3.eth.getBlockNumber();
-    expect(await this.token.numCheckpoints(holder)).to.be.bignumber.equal('6');
+    expect(await this.token.getVotes(holder, block)).to.be.bignumber.equal('6');
     // recent
     expect(await this.token.getPastVotes(holder, block - 1)).to.be.bignumber.equal('5');
     // non-recent
@@ -172,7 +172,7 @@ contract('ERC20Votes', function (accounts) {
 
         await expectRevert(
           this.token.delegateBySig(delegatorAddress, nonce, MAX_UINT256, v, r, s),
-          'ERC20Votes: invalid nonce',
+          'Votes: invalid nonce',
         );
       });
 
@@ -204,7 +204,7 @@ contract('ERC20Votes', function (accounts) {
         ));
         await expectRevert(
           this.token.delegateBySig(delegatorAddress, nonce + 1, MAX_UINT256, v, r, s),
-          'ERC20Votes: invalid nonce',
+          'Votes: invalid nonce',
         );
       });
 
@@ -221,7 +221,7 @@ contract('ERC20Votes', function (accounts) {
 
         await expectRevert(
           this.token.delegateBySig(delegatorAddress, nonce, expiry, v, r, s),
-          'ERC20Votes: signature expired',
+          'Votes: signature expired',
         );
       });
     });
@@ -347,7 +347,7 @@ contract('ERC20Votes', function (accounts) {
       });
     });
 
-    describe('numCheckpoints', function () {
+    describe.skip('numCheckpoints', function () {
       it('returns the number of checkpoints for a delegate', async function () {
         await this.token.transfer(recipient, '100', { from: holder }); //give an account a few tokens for readability
         expect(await this.token.numCheckpoints(other1)).to.be.bignumber.equal('0');
@@ -400,7 +400,7 @@ contract('ERC20Votes', function (accounts) {
       it('reverts if block number >= current block', async function () {
         await expectRevert(
           this.token.getPastVotes(other1, 5e10),
-          'ERC20Votes: block not yet mined',
+          'Checkpoints: invalid past lookup',
         );
       });
 
@@ -462,7 +462,7 @@ contract('ERC20Votes', function (accounts) {
     it('reverts if block number >= current block', async function () {
       await expectRevert(
         this.token.getPastTotalSupply(5e10),
-        'ERC20Votes: block not yet mined',
+        'Checkpoints: invalid past lookup',
       );
     });
 
diff --git a/test/token/ERC20/extensions/ERC20VotesComp.test.js b/test/token/ERC20/extensions/ERC20VotesComp.test.js
index b70c6d16792..8c0a5211011 100644
--- a/test/token/ERC20/extensions/ERC20VotesComp.test.js
+++ b/test/token/ERC20/extensions/ERC20VotesComp.test.js
@@ -159,7 +159,7 @@ contract('ERC20VotesComp', function (accounts) {
 
         await expectRevert(
           this.token.delegateBySig(delegatorAddress, nonce, MAX_UINT256, v, r, s),
-          'ERC20Votes: invalid nonce',
+          'Votes: invalid nonce',
         );
       });
 
@@ -191,7 +191,7 @@ contract('ERC20VotesComp', function (accounts) {
         ));
         await expectRevert(
           this.token.delegateBySig(delegatorAddress, nonce + 1, MAX_UINT256, v, r, s),
-          'ERC20Votes: invalid nonce',
+          'Votes: invalid nonce',
         );
       });
 
@@ -208,7 +208,7 @@ contract('ERC20VotesComp', function (accounts) {
 
         await expectRevert(
           this.token.delegateBySig(delegatorAddress, nonce, expiry, v, r, s),
-          'ERC20Votes: signature expired',
+          'Votes: signature expired',
         );
       });
     });
@@ -325,7 +325,7 @@ contract('ERC20VotesComp', function (accounts) {
       });
     });
 
-    describe('numCheckpoints', function () {
+    describe.skip('numCheckpoints', function () {
       it('returns the number of checkpoints for a delegate', async function () {
         await this.token.transfer(recipient, '100', { from: holder }); //give an account a few tokens for readability
         expect(await this.token.numCheckpoints(other1)).to.be.bignumber.equal('0');
@@ -378,7 +378,7 @@ contract('ERC20VotesComp', function (accounts) {
       it('reverts if block number >= current block', async function () {
         await expectRevert(
           this.token.getPriorVotes(other1, 5e10),
-          'ERC20Votes: block not yet mined',
+          'Checkpoints: invalid past lookup',
         );
       });
 
@@ -440,7 +440,7 @@ contract('ERC20VotesComp', function (accounts) {
     it('reverts if block number >= current block', async function () {
       await expectRevert(
         this.token.getPastTotalSupply(5e10),
-        'ERC20Votes: block not yet mined',
+        'Checkpoints: invalid past lookup',
       );
     });
 
diff --git a/test/utils/Nonces.test.js b/test/utils/Nonces.test.js
new file mode 100644
index 00000000000..7b58a0f8525
--- /dev/null
+++ b/test/utils/Nonces.test.js
@@ -0,0 +1,20 @@
+require('@openzeppelin/test-helpers');
+
+const NoncesImpl = artifacts.require('NoncesImpl');
+
+contract('Nonces', function (accounts) {
+  const [ sender ] = accounts;
+
+  beforeEach(async function () {
+    this.nonces = await NoncesImpl.new();
+  });
+
+  it('gets a nonce', async function () {
+    expect(await this.nonces.nonces(sender)).to.be.bignumber.equal('0');
+  });
+
+  it('increment a nonce', async function () {
+    await this.nonces.useNonce(sender);
+    expect(await this.nonces.nonces(sender)).to.be.bignumber.equal('1');
+  });
+});