diff --git a/README.md b/README.md
index 6b1a392924..4c8dd58c1c 100644
--- a/README.md
+++ b/README.md
@@ -22,124 +22,132 @@ CIP Editors meetings are public, recorded, and [published on Youtube](https://ww
> **Note** To facilitate browsing and information sharing for non-Github users, an auto-generated site is also provided at [cips.cardano.org](https://cips.cardano.org/).
-## Reviewed Proposals
-
-| # | Title | Status |
-| --- | --- | --- |
-| 1 | [CIP process](./CIP-0001/) | Active |
-| 2 | [Coin Selection Algorithms for Cardano](./CIP-0002/) | Active |
-| 3 | [Wallet key generation](./CIP-0003/) | Active |
-| 4 | [Wallet Checksums](./CIP-0004/) | Proposed |
-| 5 | [Common Bech32 Prefixes](./CIP-0005/) | Active |
-| 6 | [Stake Pool Extended Metadata](./CIP-0006/) | Draft |
-| 7 | [Curve Pledge Benefit](./CIP-0007/) | Proposed |
-| 8 | [Message Signing](./CIP-0008/) | Draft |
-| 9 | [Protocol Parameters (Shelley Era)](./CIP-0009/) | Active |
-| 10 | [Transaction Metadata Label Registry](./CIP-0010/) | Active |
-| 11 | [Staking key chain for HD wallets](./CIP-0011/) | Active |
-| 12 | [On-chain stake pool operator to delegates communication](./CIP-0012/) | Draft |
-| 13 | [Cardano URI Scheme](./CIP-0013/) | Proposed |
-| 14 | [User-Facing Asset Fingerprint](./CIP-0014/) | Active |
-| 15 | [Catalyst Registration Transaction Metadata Format](./CIP-0015/) | Active |
-| 16 | [Cryptographic Key Serialisation Formats](./CIP-0016/) | Active |
-| 17 | [Cardano Delegation Portfolio](./CIP-0017/) | Active |
-| 18 | [Multi-Stake-Keys Wallets](./CIP-0018/) | Draft |
-| 19 | [Cardano Addresses](./CIP-0019/) | Active |
-| 20 | [Transaction message/comment metadata](./CIP-0020/) | Active |
-| 21 | [Transaction requirements for interoperability with hardware wallets](./CIP-0021/) | Draft |
-| 22 | [Pool operator verification](./CIP-0022/) | Active |
-| 23 | [Fair Min Fees](./CIP-0023/) | Draft |
-| 24 | [Non-Centralizing Rankings](./CIP-0024/) | Draft |
-| 25 | [Media NFT Metadata Standard](./CIP-0025/) | Active |
-| 26 | [Cardano Off-Chain Metadata](./CIP-0026/) | Draft |
-| 27 | [CNFT Community Royalties Standard](./CIP-0027/) | Draft |
-| 28 | [Protocol Parameters (Alonzo Era)](./CIP-0028/) | Active |
-| 29 | [Phase-1 Monetary Scripts Serialization Formats](./CIP-0029/) | Active |
-| 30 | [Cardano dApp-Wallet Web Bridge](./CIP-0030/) | Active |
-| 31 | [Reference Inputs](./CIP-0031/) | Active |
-| 32 | [Inline Datums](./CIP-0032/) | Active |
-| 33 | [Reference Scripts](./CIP-0033/) | Active |
-| 34 | [Chain ID Registry](./CIP-0034/) | Draft |
-| 35 | [Plutus Core Evolution](./CIP-0035) | Active |
-| 36 | [Catalyst/Voltaire Registration Transaction Metadata Format](./CIP-0036) | Proposed |
-| 37 | [Dynamic Saturation Based on Pledge](./CIP-0037) | Proposed |
-| 40 | [Collateral Output](./CIP-0040) | Active |
-| 42 | [New Plutus Builtin: serialiseBuiltinData](./CIP-0042) | Active |
-| 49 | [ECDSA and Schnorr signatures in Plutus Core](./CIP-0049) | Proposed |
-| 52 | [Cardano Audit Best Practice Guidelines](./CIP-0052) | Proposed |
-| 54 | [Cardano Smart NFTs](./CIP-0054) | Draft |
-| 55 | [Protocol Parameters (Babbage Era)](./CIP-0055) | Active |
-| 57 | [Plutus Smart-Contract Blueprint](./CIP-0057) | Active |
-| 58 | [Plutus Bitwise Primitives](./CIP-0058) | Proposed |
-| 59 | [Terminology Surrounding Core Features](./CIP-0059) | Active |
-| 60 | [Music Token Metadata](./CIP-0060) | Active |
-| 67 | [Asset Name Label Registry](./CIP-0067) | Proposed |
-| 68 | [Datum Metadata Standard](./CIP-0068) | Proposed |
-| 71 | [Non-Fungible Token (NFT) Proxy Voting Standard](./CIP-0071) | Proposed |
-| 74 | [Set min-pool-cost to 0](./CIP-0074) | Proposed |
-| 75 | [Fair Stake Pool Rewards](./CIP-0075) | Inactive |
-| 80 | [Transaction Serialization Deprecation Cycle](./CIP-0080) | Active |
-| 82 | [Improved Rewards Scheme Parameters](./CIP-0082) | Inactive |
-| 83 | [Encrypted Transaction message/comment metadata (Addendum to CIP-0020)](./CIP-0083) | Active |
-| 85 | [Sums-of-products in Plutus Core](./CIP-0085) | Proposed |
-| 86 | [NFT Metadata Update Oracles](./CIP-0086) | Proposed |
-| 94 | [SPO On-chain Polls](./CIP-0094) | Active |
-| 381 | [Plutus Support for Pairings Over BLS12-381](./CIP-0381) | Proposed |
+## Cardano Improvement Proposals (CIP)
+
+| # | Title | Status |
+| ---- | --- | --- |
+| 0001 | [CIP process](./CIP-0001/) | Active |
+| 0002 | [Coin Selection Algorithms for Cardano](./CIP-0002/) | Active |
+| 0003 | [Wallet key generation](./CIP-0003/) | Active |
+| 0004 | [Wallet Checksums](./CIP-0004/) | Proposed |
+| 0005 | [Common Bech32 Prefixes](./CIP-0005/) | Active |
+| 0006 | [Stake Pool Extended Metadata](./CIP-0006/) | Draft |
+| 0007 | [Curve Pledge Benefit](./CIP-0007/) | Proposed |
+| 0008 | [Message Signing](./CIP-0008/) | Draft |
+| 0009 | [Protocol Parameters (Shelley Era)](./CIP-0009/) | Active |
+| 0010 | [Transaction Metadata Label Registry](./CIP-0010/) | Active |
+| 0011 | [Staking key chain for HD wallets](./CIP-0011/) | Active |
+| 0012 | [On-chain stake pool operator to delegates communication](./CIP-0012/) | Draft |
+| 0013 | [Cardano URI Scheme](./CIP-0013/) | Proposed |
+| 0014 | [User-Facing Asset Fingerprint](./CIP-0014/) | Active |
+| 0015 | [Catalyst Registration Transaction Metadata Format](./CIP-0015/) | Active |
+| 0016 | [Cryptographic Key Serialisation Formats](./CIP-0016/) | Active |
+| 0017 | [Cardano Delegation Portfolio](./CIP-0017/) | Active |
+| 0018 | [Multi-Stake-Keys Wallets](./CIP-0018/) | Draft |
+| 0019 | [Cardano Addresses](./CIP-0019/) | Active |
+| 0020 | [Transaction message/comment metadata](./CIP-0020/) | Active |
+| 0021 | [Transaction requirements for interoperability with hardware wallets](./CIP-0021/) | Draft |
+| 0022 | [Pool operator verification](./CIP-0022/) | Active |
+| 0023 | [Fair Min Fees](./CIP-0023/) | Draft |
+| 0024 | [Non-Centralizing Rankings](./CIP-0024/) | Draft |
+| 0025 | [Media NFT Metadata Standard](./CIP-0025/) | Active |
+| 0026 | [Cardano Off-Chain Metadata](./CIP-0026/) | Draft |
+| 0027 | [CNFT Community Royalties Standard](./CIP-0027/) | Draft |
+| 0028 | [Protocol Parameters (Alonzo Era)](./CIP-0028/) | Active |
+| 0029 | [Phase-1 Monetary Scripts Serialization Formats](./CIP-0029/) | Active |
+| 0030 | [Cardano dApp-Wallet Web Bridge](./CIP-0030/) | Active |
+| 0031 | [Reference Inputs](./CIP-0031/) | Active |
+| 0032 | [Inline Datums](./CIP-0032/) | Active |
+| 0033 | [Reference Scripts](./CIP-0033/) | Active |
+| 0034 | [Chain ID Registry](./CIP-0034/) | Draft |
+| 0035 | [Plutus Core Evolution](./CIP-0035) | Active |
+| 0036 | [Catalyst/Voltaire Registration Transaction Metadata Format](./CIP-0036) | Proposed |
+| 0037 | [Dynamic Saturation Based on Pledge](./CIP-0037) | Proposed |
+| 0040 | [Collateral Output](./CIP-0040) | Active |
+| 0042 | [New Plutus Builtin: serialiseBuiltinData](./CIP-0042) | Active |
+| 0049 | [ECDSA and Schnorr signatures in Plutus Core](./CIP-0049) | Proposed |
+| 0052 | [Cardano Audit Best Practice Guidelines](./CIP-0052) | Proposed |
+| 0054 | [Cardano Smart NFTs](./CIP-0054) | Draft |
+| 0055 | [Protocol Parameters (Babbage Era)](./CIP-0055) | Active |
+| 0057 | [Plutus Smart-Contract Blueprint](./CIP-0057) | Active |
+| 0058 | [Plutus Bitwise Primitives](./CIP-0058) | Proposed |
+| 0059 | [Terminology Surrounding Core Features](./CIP-0059) | Active |
+| 0060 | [Music Token Metadata](./CIP-0060) | Active |
+| 0067 | [Asset Name Label Registry](./CIP-0067) | Proposed |
+| 0068 | [Datum Metadata Standard](./CIP-0068) | Proposed |
+| 0069 | [Plutus Script Type Uniformization](./CIP-0069) | Proposed |
+| 0071 | [Non-Fungible Token (NFT) Proxy Voting Standard](./CIP-0071) | Proposed |
+| 0072 | [DApp Registration](./CIP-0072) | Proposed |
+| 0074 | [Set min-pool-cost to 0](./CIP-0074) | Proposed |
+| 0075 | [Fair Stake Pool Rewards](./CIP-0075) | Inactive |
+| 0080 | [Transaction Serialization Deprecation Cycle](./CIP-0080) | Active |
+| 0082 | [Improved Rewards Scheme Parameters](./CIP-0082) | Inactive |
+| 0083 | [Encrypted Transaction message/comment metadata (Addendum to CIP-0020)](./CIP-0083) | Active |
+| 0085 | [Sums-of-products in Plutus Core](./CIP-0085) | Proposed |
+| 0086 | [NFT Metadata Update Oracles](./CIP-0086) | Proposed |
+| 0094 | [SPO On-chain Polls](./CIP-0094) | Active |
+| 0381 | [Plutus Support for Pairings Over BLS12-381](./CIP-0381) | Proposed |
| 1852 | [HD (Hierarchy for Deterministic) Wallets for Cardano](./CIP-1852/) | Active |
| 1853 | [HD (Hierarchy for Deterministic) Stake Pool Cold Keys for Cardano](./CIP-1853/) | Active |
| 1854 | [Multi-signatures HD Wallets](./CIP-1854/) | Draft |
| 1855 | [Forging policy keys for HD Wallets](./CIP-1855/) | Active |
| 9999 | [Cardano Problem Statements](./CIP-9999/) | Active |
-Last updated on 2023-06-09
-
-> 💡 For more details about Statuses, refer to [CIP-0001](./CIP-0001).
-
### Proposals Under Review (CIP)
Below are listed tentative CIPs still under discussion with the community. They are listed below for easing navigation and tentatively allocating numbers to avoid later clashes.
-| **#** | **Title** |
-| --- | --- |
-| 38? | [Arbitrary Script as Native Script Spending Conditions](https://github.com/cardano-foundation/CIPs/pull/309)
-| 39? | [Language Annotated Address](https://github.com/cardano-foundation/CIPs/pull/310) |
-| 45? | [Decentralized WebRTC dApp-Wallet Communication](https://github.com/cardano-foundation/CIPs/pull/395) |
-| 50? | [Shelley's Voltaire Decentralization Update](https://github.com/cardano-foundation/CIPs/pull/242) |
-| 56? | [Treasury Donation](https://github.com/cardano-foundation/CIPs/pull/269) |
-| 62? | [Governance API for dApp Connectors](https://github.com/cardano-foundation/CIPs/pull/296) |
-| 69? | [Plutus Script Type Uniformization](https://github.com/cardano-foundation/CIPs/pull/321/) |
-| 72? | [DApp Registration](https://github.com/cardano-foundation/CIPs/pull/355) |
-| 73? | [Oracle Datum Standard](https://github.com/cardano-foundation/CIPs/pull/357) |
-| 76? | [Hash-Checked Data](https://github.com/cardano-foundation/CIPs/pull/363) |
-| 77? | [Verified Stake Pool Identity](https://github.com/cardano-foundation/CIPs/pull/361) |
-| 79? | [Implement Ouroboros Leios to increase Cardano throughput](https://github.com/cardano-foundation/CIPs/pull/379) |
-| 84? | [Cardano Ledger Evolution](https://github.com/cardano-foundation/CIPs/pull/456) |
-| 87? | [Maybe Datum](https://github.com/cardano-foundation/CIPs/pull/440) |
-| 88? | [Native Asset Policy Registration/Information Certificates](https://github.com/cardano-foundation/CIPs/pull/467) |
-| 89? | [Beacon Tokens & Distributed Dapps](https://github.com/cardano-foundation/CIPs/pull/466) |
-| 90? | [Extendable dApp-Wallet Web Bridge](https://github.com/cardano-foundation/CIPs/pull/462/) |
-| 91? | [Don't force Built-In functions](https://github.com/cardano-foundation/CIPs/pull/459) |
-| 92? | [First-class errors in Plutus](https://github.com/cardano-foundation/CIPs/pull/469) |
-| 93? | [Authenticated Web3 HTTP requests](https://github.com/cardano-foundation/CIPs/pull/442) |
-| 95? | [Cardano dApp-Wallet Web Bridge Governance Extension](https://github.com/cardano-foundation/CIPs/pull/509) |
-| 96? | [On-chain dApp Certification Metadata](https://github.com/cardano-foundation/CIPs/pull/499) |
-| 97? | [Representing the Script Context as a SOP term](https://github.com/cardano-foundation/CIPs/pull/507) |
+| # | Title |
+| ----- | --- |
+| 0038? | [Arbitrary Script as Native Script Spending Conditions](https://github.com/cardano-foundation/CIPs/pull/309)
+| 0039? | [Language Annotated Address](https://github.com/cardano-foundation/CIPs/pull/310) |
+| 0045? | [Decentralized WebRTC dApp-Wallet Communication](https://github.com/cardano-foundation/CIPs/pull/395) |
+| 0050? | [Shelley's Voltaire Decentralization Update](https://github.com/cardano-foundation/CIPs/pull/242) |
+| 0056? | [Treasury Donation](https://github.com/cardano-foundation/CIPs/pull/269) |
+| 0062? | [Governance API for dApp Connectors](https://github.com/cardano-foundation/CIPs/pull/296) |
+| 0073? | [Oracle Datum Standard](https://github.com/cardano-foundation/CIPs/pull/357) |
+| 0076? | [Hash-Checked Data](https://github.com/cardano-foundation/CIPs/pull/363) |
+| 0077? | [Verified Stake Pool Identity](https://github.com/cardano-foundation/CIPs/pull/361) |
+| 0079? | [Implement Ouroboros Leios to increase Cardano throughput](https://github.com/cardano-foundation/CIPs/pull/379) |
+| 0084? | [Cardano Ledger Evolution](https://github.com/cardano-foundation/CIPs/pull/456) |
+| 0087? | [Maybe Datum](https://github.com/cardano-foundation/CIPs/pull/440) |
+| 0088? | [Native Asset Policy Registration/Information Certificates](https://github.com/cardano-foundation/CIPs/pull/467) |
+| 0089? | [Beacon Tokens & Distributed Dapps](https://github.com/cardano-foundation/CIPs/pull/466) |
+| 0090? | [Extendable dApp-Wallet Web Bridge](https://github.com/cardano-foundation/CIPs/pull/462/) |
+| 0091? | [Don't force Built-In functions](https://github.com/cardano-foundation/CIPs/pull/459) |
+| 0092? | [First-class errors in Plutus](https://github.com/cardano-foundation/CIPs/pull/469) |
+| 0093? | [Authenticated Web3 HTTP requests](https://github.com/cardano-foundation/CIPs/pull/442) |
+| 0095? | [Cardano dApp-Wallet Web Bridge Governance Extension](https://github.com/cardano-foundation/CIPs/pull/509) |
+| 0096? | [On-chain dApp Certification Metadata](https://github.com/cardano-foundation/CIPs/pull/499) |
+| 0097? | [Representing the Script Context as a SOP term](https://github.com/cardano-foundation/CIPs/pull/507) |
| 1694? | [A proposal for entering the Voltaire phase](https://github.com/cardano-foundation/CIPs/pull/380) |
Last updated on 2023-06-09
+## Cardano Problem Statements (CPS)
+
+| # | Title | Status |
+| ---- | --- | --- |
+| 0005 | [Plutus Script Usability](./CPS-0005) | Open |
+
+Last updated on 2023-06-09
+
+> 💡 For more details about Statuses, refer to [CIP-0001](./CIP-0001).
+
### Proposals Under Review (CPS)
Below are listed tentative CPSs still under discussion with the community. They are listed below for easing navigation and also tentatively allocating numbers to avoid clashes later on.
-| **#** | **Title** |
-| --- | --- |
-| 1? | [Metadata Discoverability and Trust](https://github.com/cardano-foundation/CIPs/pull/371) |
-| 2? | [Pointer Addresses](https://github.com/cardano-foundation/CIPs/pull/374) |
-| 3? | [Smart Tokens](https://github.com/cardano-foundation/CIPs/pull/382) |
-| 4? | [Spending Script Redundant Execution](https://github.com/cardano-foundation/CIPs/pull/418/) |
+| # | Title |
+| ----- | --- |
+| 0001? | [Metadata Discoverability and Trust](https://github.com/cardano-foundation/CIPs/pull/371) |
+| 0002? | [Pointer Addresses](https://github.com/cardano-foundation/CIPs/pull/374) |
+| 0003? | [Smart Tokens](https://github.com/cardano-foundation/CIPs/pull/382) |
+| 0004? | [Spending Script Redundant Execution](https://github.com/cardano-foundation/CIPs/pull/418/) |
+| 0006? | [Governance Security](https://github.com/cardano-foundation/CIPs/pull/491) |
+| 0007? | [Voltaire era Governance](https://github.com/cardano-foundation/CIPs/pull/481) |
-Last updated on 2023-05-30
+Last updated on 2023-06-09
## Stalled / Waiting For Authors
@@ -155,7 +163,7 @@ The following list contains proposals that have been under review and for which
- [Merklised Plutus Scripts](https://github.com/cardano-foundation/CIPs/pull/385)
- [Rejected Ideas w.r.t Spending Policies](https://github.com/cardano-foundation/CIPs/pull/336)
-Last updated on 2023-05-30
+Last updated on 2023-06-09
## Editors