diff --git a/contracts/cli/contribute.ts b/contracts/cli/contribute.ts
index be393c700..c06e5fb1d 100644
--- a/contracts/cli/contribute.ts
+++ b/contracts/cli/contribute.ts
@@ -93,7 +93,6 @@ async function main(args: any) {
       '_amount'
     )
 
-    console.log('saving states with amount', amount)
     state.contributors[contributorAddress] = {
       privKey: contributorKeypair.privKey.serialize(),
       pubKey: contributorKeypair.pubKey.serialize(),
diff --git a/subgraph/abis/FundingRound.json b/subgraph/abis/FundingRound.json
index 7a482f795..e674c6c8f 100644
--- a/subgraph/abis/FundingRound.json
+++ b/subgraph/abis/FundingRound.json
@@ -25,6 +25,238 @@
     "stateMutability": "nonpayable",
     "type": "constructor"
   },
+  {
+    "inputs": [],
+    "name": "AlreadyContributed",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "ContributionAmountIsZero",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "ContributionAmountTooLarge",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "EmptyTallyHash",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "FundsAlreadyClaimed",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "total",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "actual",
+        "type": "uint256"
+      }
+    ],
+    "name": "IncompleteTallyResults",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "IncorrectPerVOSpentVoiceCredits",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "IncorrectSpentVoiceCredits",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "IncorrectTallyResult",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidBudget",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidCoordinator",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidMaci",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidMessageProcessor",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidNativeToken",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidPoll",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidRecipientRegistry",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidTally",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidUserRegistry",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "MaciAlreadySet",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "MaciNotSet",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NoProjectHasMoreThanOneVote",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NoVoiceCredits",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NoVotes",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotContributor",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotCoordinator",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NothingToWithdraw",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "OnlyMaciCanRegisterVoters",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "PollNotSet",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "RoundAlreadyFinalized",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "RoundCancelled",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "RoundNotCancelled",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "RoundNotFinalized",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "TallyHashNotPublished",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "TopupAmountIsZero",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "TopupAmountTooLarge",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "expected",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "actual",
+        "type": "address"
+      }
+    ],
+    "name": "UnexpectedPollAddress",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "UserAlreadyRegistered",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "UserHasNotContributed",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "UserNotVerified",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "VoteResultsAlreadyVerified",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "VotesNotTallied",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "VotingPeriodNotPassed",
+    "type": "error"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -101,6 +333,19 @@
     "name": "OwnershipTransferred",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "_poll",
+        "type": "address"
+      }
+    ],
+    "name": "PollSet",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -114,6 +359,57 @@
     "name": "TallyPublished",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "_voteOptionIndex",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "_tally",
+        "type": "uint256"
+      }
+    ],
+    "name": "TallyResultsAdded",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "_tally",
+        "type": "address"
+      }
+    ],
+    "name": "TallySet",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "_sender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "_amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "Topup",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -127,6 +423,61 @@
     "name": "Voted",
     "type": "event"
   },
+  {
+    "inputs": [],
+    "name": "MESSAGE_DATA_LENGTH",
+    "outputs": [
+      {
+        "internalType": "uint8",
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "alpha",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "_budget",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_totalVotesSquares",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_totalSpent",
+        "type": "uint256"
+      }
+    ],
+    "name": "calcAlpha",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "_alpha",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "cancel",
@@ -134,6 +485,44 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "_voteOptionIndex",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_spent",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256[][]",
+        "name": "_spentProof",
+        "type": "uint256[][]"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_spentSalt",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_resultsCommitment",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_spentVoiceCreditsCommitment",
+        "type": "uint256"
+      }
+    ],
+    "name": "claimFunds",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -149,7 +538,7 @@
             "type": "uint256"
           }
         ],
-        "internalType": "struct MACISharedObjs.PubKey",
+        "internalType": "struct DomainObjs.PubKey",
         "name": "pubKey",
         "type": "tuple"
       },
@@ -177,6 +566,30 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "contributors",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bool",
+        "name": "isRegistered",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "coordinator",
@@ -201,6 +614,16 @@
         "internalType": "uint256",
         "name": "_totalSpentSalt",
         "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_newResultCommitment",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_perVOSpentVoiceCreditsHash",
+        "type": "uint256"
       }
     ],
     "name": "finalize",
@@ -256,6 +679,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "addressValue",
+        "type": "address"
+      }
+    ],
+    "name": "isAddressZero",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "isCancelled",
@@ -334,6 +776,32 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "poll",
+    "outputs": [
+      {
+        "internalType": "contract Poll",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "pollId",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -360,6 +828,35 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "recipients",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "fundsClaimed",
+        "type": "bool"
+      },
+      {
+        "internalType": "bool",
+        "name": "tallyVerified",
+        "type": "bool"
+      },
+      {
+        "internalType": "uint256",
+        "name": "tallyResult",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -385,12 +882,46 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "resetTally",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
         "internalType": "contract MACI",
         "name": "_maci",
         "type": "address"
+      },
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "poll",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "messageProcessor",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "tally",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "subsidy",
+            "type": "address"
+          }
+        ],
+        "internalType": "struct MACI.PollContracts",
+        "name": "_pollContracts",
+        "type": "tuple"
       }
     ],
     "name": "setMaci",
@@ -398,13 +929,26 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "contract MACI",
+        "name": "_maci",
+        "type": "address"
+      }
+    ],
+    "name": "setMaciInstance",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
         "components": [
           {
             "internalType": "uint256",
-            "name": "iv",
+            "name": "msgType",
             "type": "uint256"
           },
           {
@@ -413,7 +957,7 @@
             "type": "uint256[10]"
           }
         ],
-        "internalType": "struct MACISharedObjs.Message[]",
+        "internalType": "struct DomainObjs.Message[]",
         "name": "_messages",
         "type": "tuple[]"
       },
@@ -430,7 +974,7 @@
             "type": "uint256"
           }
         ],
-        "internalType": "struct MACISharedObjs.PubKey[]",
+        "internalType": "struct DomainObjs.PubKey[]",
         "name": "_encPubKeys",
         "type": "tuple[]"
       }
@@ -440,6 +984,19 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "tally",
+    "outputs": [
+      {
+        "internalType": "contract Tally",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "tallyHash",
@@ -453,12 +1010,30 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "stateIndex",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "topup",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
-    "name": "poll",
+    "name": "topupToken",
     "outputs": [
       {
-        "internalType": "contract Poll",
+        "internalType": "contract TopupToken",
         "name": "",
         "type": "address"
       }
@@ -468,7 +1043,7 @@
   },
   {
     "inputs": [],
-    "name": "pollId",
+    "name": "totalSpent",
     "outputs": [
       {
         "internalType": "uint256",
@@ -481,7 +1056,7 @@
   },
   {
     "inputs": [],
-    "name": "totalSpent",
+    "name": "totalTallyResults",
     "outputs": [
       {
         "internalType": "uint256",
@@ -505,6 +1080,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "totalVotesSquares",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -544,6 +1132,13 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "withdrawContribution",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -552,8 +1147,14 @@
         "type": "address[]"
       }
     ],
-    "name": "withdrawContribution",
-    "outputs": [],
+    "name": "withdrawContributions",
+    "outputs": [
+      {
+        "internalType": "bool[]",
+        "name": "result",
+        "type": "bool[]"
+      }
+    ],
     "stateMutability": "nonpayable",
     "type": "function"
   }
diff --git a/subgraph/config/arbitrum-sepolia.json b/subgraph/config/arbitrum-sepolia.json
index aee545b9a..55ba6d285 100644
--- a/subgraph/config/arbitrum-sepolia.json
+++ b/subgraph/config/arbitrum-sepolia.json
@@ -1,6 +1,6 @@
 {
   "network": "arbitrum-sepolia",
-  "address": "0x22Ff798925A76B21f8122C04D10f177ea52D6411",
-  "clrFundStartBlock": 9007610,
-  "recipientRegistryStartBlock": 9007610
+  "address": "0x504ED10334aa88E313cC2cfFF4D176796Bd8B00C",
+  "clrFundStartBlock": 10048750,
+  "recipientRegistryStartBlock": 10048750
 }
diff --git a/subgraph/generated/ClrFund/FundingRound.ts b/subgraph/generated/ClrFund/FundingRound.ts
index e86a75ef4..194e40e1d 100644
--- a/subgraph/generated/ClrFund/FundingRound.ts
+++ b/subgraph/generated/ClrFund/FundingRound.ts
@@ -98,6 +98,24 @@ export class OwnershipTransferred__Params {
   }
 }
 
+export class PollSet extends ethereum.Event {
+  get params(): PollSet__Params {
+    return new PollSet__Params(this);
+  }
+}
+
+export class PollSet__Params {
+  _event: PollSet;
+
+  constructor(event: PollSet) {
+    this._event = event;
+  }
+
+  get _poll(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+}
+
 export class TallyPublished extends ethereum.Event {
   get params(): TallyPublished__Params {
     return new TallyPublished__Params(this);
@@ -116,6 +134,68 @@ export class TallyPublished__Params {
   }
 }
 
+export class TallyResultsAdded extends ethereum.Event {
+  get params(): TallyResultsAdded__Params {
+    return new TallyResultsAdded__Params(this);
+  }
+}
+
+export class TallyResultsAdded__Params {
+  _event: TallyResultsAdded;
+
+  constructor(event: TallyResultsAdded) {
+    this._event = event;
+  }
+
+  get _voteOptionIndex(): BigInt {
+    return this._event.parameters[0].value.toBigInt();
+  }
+
+  get _tally(): BigInt {
+    return this._event.parameters[1].value.toBigInt();
+  }
+}
+
+export class TallySet extends ethereum.Event {
+  get params(): TallySet__Params {
+    return new TallySet__Params(this);
+  }
+}
+
+export class TallySet__Params {
+  _event: TallySet;
+
+  constructor(event: TallySet) {
+    this._event = event;
+  }
+
+  get _tally(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+}
+
+export class Topup extends ethereum.Event {
+  get params(): Topup__Params {
+    return new Topup__Params(this);
+  }
+}
+
+export class Topup__Params {
+  _event: Topup;
+
+  constructor(event: Topup) {
+    this._event = event;
+  }
+
+  get _sender(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+
+  get _amount(): BigInt {
+    return this._event.parameters[1].value.toBigInt();
+  }
+}
+
 export class Voted extends ethereum.Event {
   get params(): Voted__Params {
     return new Voted__Params(this);
@@ -134,11 +214,145 @@ export class Voted__Params {
   }
 }
 
+export class FundingRound__contributorsResult {
+  value0: BigInt;
+  value1: boolean;
+
+  constructor(value0: BigInt, value1: boolean) {
+    this.value0 = value0;
+    this.value1 = value1;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0));
+    map.set("value1", ethereum.Value.fromBoolean(this.value1));
+    return map;
+  }
+
+  getAmount(): BigInt {
+    return this.value0;
+  }
+
+  getIsRegistered(): boolean {
+    return this.value1;
+  }
+}
+
+export class FundingRound__recipientsResult {
+  value0: boolean;
+  value1: boolean;
+  value2: BigInt;
+
+  constructor(value0: boolean, value1: boolean, value2: BigInt) {
+    this.value0 = value0;
+    this.value1 = value1;
+    this.value2 = value2;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromBoolean(this.value0));
+    map.set("value1", ethereum.Value.fromBoolean(this.value1));
+    map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2));
+    return map;
+  }
+
+  getFundsClaimed(): boolean {
+    return this.value0;
+  }
+
+  getTallyVerified(): boolean {
+    return this.value1;
+  }
+
+  getTallyResult(): BigInt {
+    return this.value2;
+  }
+}
+
 export class FundingRound extends ethereum.SmartContract {
   static bind(address: Address): FundingRound {
     return new FundingRound("FundingRound", address);
   }
 
+  MESSAGE_DATA_LENGTH(): i32 {
+    let result = super.call(
+      "MESSAGE_DATA_LENGTH",
+      "MESSAGE_DATA_LENGTH():(uint8)",
+      []
+    );
+
+    return result[0].toI32();
+  }
+
+  try_MESSAGE_DATA_LENGTH(): ethereum.CallResult<i32> {
+    let result = super.tryCall(
+      "MESSAGE_DATA_LENGTH",
+      "MESSAGE_DATA_LENGTH():(uint8)",
+      []
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toI32());
+  }
+
+  alpha(): BigInt {
+    let result = super.call("alpha", "alpha():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_alpha(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("alpha", "alpha():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
+  calcAlpha(
+    _budget: BigInt,
+    _totalVotesSquares: BigInt,
+    _totalSpent: BigInt
+  ): BigInt {
+    let result = super.call(
+      "calcAlpha",
+      "calcAlpha(uint256,uint256,uint256):(uint256)",
+      [
+        ethereum.Value.fromUnsignedBigInt(_budget),
+        ethereum.Value.fromUnsignedBigInt(_totalVotesSquares),
+        ethereum.Value.fromUnsignedBigInt(_totalSpent)
+      ]
+    );
+
+    return result[0].toBigInt();
+  }
+
+  try_calcAlpha(
+    _budget: BigInt,
+    _totalVotesSquares: BigInt,
+    _totalSpent: BigInt
+  ): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "calcAlpha",
+      "calcAlpha(uint256,uint256,uint256):(uint256)",
+      [
+        ethereum.Value.fromUnsignedBigInt(_budget),
+        ethereum.Value.fromUnsignedBigInt(_totalVotesSquares),
+        ethereum.Value.fromUnsignedBigInt(_totalSpent)
+      ]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   contributorCount(): BigInt {
     let result = super.call(
       "contributorCount",
@@ -162,6 +376,39 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  contributors(param0: Address): FundingRound__contributorsResult {
+    let result = super.call(
+      "contributors",
+      "contributors(address):(uint256,bool)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+
+    return new FundingRound__contributorsResult(
+      result[0].toBigInt(),
+      result[1].toBoolean()
+    );
+  }
+
+  try_contributors(
+    param0: Address
+  ): ethereum.CallResult<FundingRound__contributorsResult> {
+    let result = super.tryCall(
+      "contributors",
+      "contributors(address):(uint256,bool)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new FundingRound__contributorsResult(
+        value[0].toBigInt(),
+        value[1].toBoolean()
+      )
+    );
+  }
+
   coordinator(): Address {
     let result = super.call("coordinator", "coordinator():(address)", []);
 
@@ -235,6 +482,27 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  isAddressZero(addressValue: Address): boolean {
+    let result = super.call("isAddressZero", "isAddressZero(address):(bool)", [
+      ethereum.Value.fromAddress(addressValue)
+    ]);
+
+    return result[0].toBoolean();
+  }
+
+  try_isAddressZero(addressValue: Address): ethereum.CallResult<boolean> {
+    let result = super.tryCall(
+      "isAddressZero",
+      "isAddressZero(address):(bool)",
+      [ethereum.Value.fromAddress(addressValue)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBoolean());
+  }
+
   isCancelled(): boolean {
     let result = super.call("isCancelled", "isCancelled():(bool)", []);
 
@@ -333,6 +601,36 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  poll(): Address {
+    let result = super.call("poll", "poll():(address)", []);
+
+    return result[0].toAddress();
+  }
+
+  try_poll(): ethereum.CallResult<Address> {
+    let result = super.tryCall("poll", "poll():(address)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toAddress());
+  }
+
+  pollId(): BigInt {
+    let result = super.call("pollId", "pollId():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_pollId(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   recipientRegistry(): Address {
     let result = super.call(
       "recipientRegistry",
@@ -356,6 +654,56 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  recipients(param0: BigInt): FundingRound__recipientsResult {
+    let result = super.call(
+      "recipients",
+      "recipients(uint256):(bool,bool,uint256)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+
+    return new FundingRound__recipientsResult(
+      result[0].toBoolean(),
+      result[1].toBoolean(),
+      result[2].toBigInt()
+    );
+  }
+
+  try_recipients(
+    param0: BigInt
+  ): ethereum.CallResult<FundingRound__recipientsResult> {
+    let result = super.tryCall(
+      "recipients",
+      "recipients(uint256):(bool,bool,uint256)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new FundingRound__recipientsResult(
+        value[0].toBoolean(),
+        value[1].toBoolean(),
+        value[2].toBigInt()
+      )
+    );
+  }
+
+  tally(): Address {
+    let result = super.call("tally", "tally():(address)", []);
+
+    return result[0].toAddress();
+  }
+
+  try_tally(): ethereum.CallResult<Address> {
+    let result = super.tryCall("tally", "tally():(address)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toAddress());
+  }
+
   tallyHash(): string {
     let result = super.call("tallyHash", "tallyHash():(string)", []);
 
@@ -371,14 +719,14 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toString());
   }
 
-  poll(): Address {
-    let result = super.call("poll", "poll():(address)", []);
+  topupToken(): Address {
+    let result = super.call("topupToken", "topupToken():(address)", []);
 
     return result[0].toAddress();
   }
 
-  try_poll(): ethereum.CallResult<Address> {
-    let result = super.tryCall("poll", "poll():(address)", []);
+  try_topupToken(): ethereum.CallResult<Address> {
+    let result = super.tryCall("topupToken", "topupToken():(address)", []);
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -386,14 +734,14 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
-  pollId(): BigInt {
-    let result = super.call("pollId", "pollId():(uint256)", []);
+  totalSpent(): BigInt {
+    let result = super.call("totalSpent", "totalSpent():(uint256)", []);
 
     return result[0].toBigInt();
   }
 
-  try_pollId(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+  try_totalSpent(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("totalSpent", "totalSpent():(uint256)", []);
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -401,14 +749,22 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
-  totalSpent(): BigInt {
-    let result = super.call("totalSpent", "totalSpent():(uint256)", []);
+  totalTallyResults(): BigInt {
+    let result = super.call(
+      "totalTallyResults",
+      "totalTallyResults():(uint256)",
+      []
+    );
 
     return result[0].toBigInt();
   }
 
-  try_totalSpent(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("totalSpent", "totalSpent():(uint256)", []);
+  try_totalTallyResults(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "totalTallyResults",
+      "totalTallyResults():(uint256)",
+      []
+    );
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -431,6 +787,29 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  totalVotesSquares(): BigInt {
+    let result = super.call(
+      "totalVotesSquares",
+      "totalVotesSquares():(uint256)",
+      []
+    );
+
+    return result[0].toBigInt();
+  }
+
+  try_totalVotesSquares(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "totalVotesSquares",
+      "totalVotesSquares():(uint256)",
+      []
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   userRegistry(): Address {
     let result = super.call("userRegistry", "userRegistry():(address)", []);
 
@@ -468,6 +847,31 @@ export class FundingRound extends ethereum.SmartContract {
     let value = result.value;
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
+
+  withdrawContributions(_contributors: Array<Address>): Array<boolean> {
+    let result = super.call(
+      "withdrawContributions",
+      "withdrawContributions(address[]):(bool[])",
+      [ethereum.Value.fromAddressArray(_contributors)]
+    );
+
+    return result[0].toBooleanArray();
+  }
+
+  try_withdrawContributions(
+    _contributors: Array<Address>
+  ): ethereum.CallResult<Array<boolean>> {
+    let result = super.tryCall(
+      "withdrawContributions",
+      "withdrawContributions(address[]):(bool[])",
+      [ethereum.Value.fromAddressArray(_contributors)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBooleanArray());
+  }
 }
 
 export class ConstructorCall extends ethereum.Call {
@@ -538,6 +942,56 @@ export class CancelCall__Outputs {
   }
 }
 
+export class ClaimFundsCall extends ethereum.Call {
+  get inputs(): ClaimFundsCall__Inputs {
+    return new ClaimFundsCall__Inputs(this);
+  }
+
+  get outputs(): ClaimFundsCall__Outputs {
+    return new ClaimFundsCall__Outputs(this);
+  }
+}
+
+export class ClaimFundsCall__Inputs {
+  _call: ClaimFundsCall;
+
+  constructor(call: ClaimFundsCall) {
+    this._call = call;
+  }
+
+  get _voteOptionIndex(): BigInt {
+    return this._call.inputValues[0].value.toBigInt();
+  }
+
+  get _spent(): BigInt {
+    return this._call.inputValues[1].value.toBigInt();
+  }
+
+  get _spentProof(): Array<Array<BigInt>> {
+    return this._call.inputValues[2].value.toBigIntMatrix();
+  }
+
+  get _spentSalt(): BigInt {
+    return this._call.inputValues[3].value.toBigInt();
+  }
+
+  get _resultsCommitment(): BigInt {
+    return this._call.inputValues[4].value.toBigInt();
+  }
+
+  get _spentVoiceCreditsCommitment(): BigInt {
+    return this._call.inputValues[5].value.toBigInt();
+  }
+}
+
+export class ClaimFundsCall__Outputs {
+  _call: ClaimFundsCall;
+
+  constructor(call: ClaimFundsCall) {
+    this._call = call;
+  }
+}
+
 export class ContributeCall extends ethereum.Call {
   get inputs(): ContributeCall__Inputs {
     return new ContributeCall__Inputs(this);
@@ -608,6 +1062,14 @@ export class FinalizeCall__Inputs {
   get _totalSpentSalt(): BigInt {
     return this._call.inputValues[1].value.toBigInt();
   }
+
+  get _newResultCommitment(): BigInt {
+    return this._call.inputValues[2].value.toBigInt();
+  }
+
+  get _perVOSpentVoiceCreditsHash(): BigInt {
+    return this._call.inputValues[3].value.toBigInt();
+  }
 }
 
 export class FinalizeCall__Outputs {
@@ -708,6 +1170,32 @@ export class RenounceOwnershipCall__Outputs {
   }
 }
 
+export class ResetTallyCall extends ethereum.Call {
+  get inputs(): ResetTallyCall__Inputs {
+    return new ResetTallyCall__Inputs(this);
+  }
+
+  get outputs(): ResetTallyCall__Outputs {
+    return new ResetTallyCall__Outputs(this);
+  }
+}
+
+export class ResetTallyCall__Inputs {
+  _call: ResetTallyCall;
+
+  constructor(call: ResetTallyCall) {
+    this._call = call;
+  }
+}
+
+export class ResetTallyCall__Outputs {
+  _call: ResetTallyCall;
+
+  constructor(call: ResetTallyCall) {
+    this._call = call;
+  }
+}
+
 export class SetMaciCall extends ethereum.Call {
   get inputs(): SetMaciCall__Inputs {
     return new SetMaciCall__Inputs(this);
@@ -728,6 +1216,12 @@ export class SetMaciCall__Inputs {
   get _maci(): Address {
     return this._call.inputValues[0].value.toAddress();
   }
+
+  get _pollContracts(): SetMaciCall_pollContractsStruct {
+    return changetype<SetMaciCall_pollContractsStruct>(
+      this._call.inputValues[1].value.toTuple()
+    );
+  }
 }
 
 export class SetMaciCall__Outputs {
@@ -738,6 +1232,54 @@ export class SetMaciCall__Outputs {
   }
 }
 
+export class SetMaciCall_pollContractsStruct extends ethereum.Tuple {
+  get poll(): Address {
+    return this[0].toAddress();
+  }
+
+  get messageProcessor(): Address {
+    return this[1].toAddress();
+  }
+
+  get tally(): Address {
+    return this[2].toAddress();
+  }
+
+  get subsidy(): Address {
+    return this[3].toAddress();
+  }
+}
+
+export class SetMaciInstanceCall extends ethereum.Call {
+  get inputs(): SetMaciInstanceCall__Inputs {
+    return new SetMaciInstanceCall__Inputs(this);
+  }
+
+  get outputs(): SetMaciInstanceCall__Outputs {
+    return new SetMaciInstanceCall__Outputs(this);
+  }
+}
+
+export class SetMaciInstanceCall__Inputs {
+  _call: SetMaciInstanceCall;
+
+  constructor(call: SetMaciInstanceCall) {
+    this._call = call;
+  }
+
+  get _maci(): Address {
+    return this._call.inputValues[0].value.toAddress();
+  }
+}
+
+export class SetMaciInstanceCall__Outputs {
+  _call: SetMaciInstanceCall;
+
+  constructor(call: SetMaciInstanceCall) {
+    this._call = call;
+  }
+}
+
 export class SubmitMessageBatchCall extends ethereum.Call {
   get inputs(): SubmitMessageBatchCall__Inputs {
     return new SubmitMessageBatchCall__Inputs(this);
@@ -777,7 +1319,7 @@ export class SubmitMessageBatchCall__Outputs {
 }
 
 export class SubmitMessageBatchCall_messagesStruct extends ethereum.Tuple {
-  get iv(): BigInt {
+  get msgType(): BigInt {
     return this[0].toBigInt();
   }
 
@@ -796,6 +1338,40 @@ export class SubmitMessageBatchCall_encPubKeysStruct extends ethereum.Tuple {
   }
 }
 
+export class TopupCall extends ethereum.Call {
+  get inputs(): TopupCall__Inputs {
+    return new TopupCall__Inputs(this);
+  }
+
+  get outputs(): TopupCall__Outputs {
+    return new TopupCall__Outputs(this);
+  }
+}
+
+export class TopupCall__Inputs {
+  _call: TopupCall;
+
+  constructor(call: TopupCall) {
+    this._call = call;
+  }
+
+  get stateIndex(): BigInt {
+    return this._call.inputValues[0].value.toBigInt();
+  }
+
+  get amount(): BigInt {
+    return this._call.inputValues[1].value.toBigInt();
+  }
+}
+
+export class TopupCall__Outputs {
+  _call: TopupCall;
+
+  constructor(call: TopupCall) {
+    this._call = call;
+  }
+}
+
 export class TransferOwnershipCall extends ethereum.Call {
   get inputs(): TransferOwnershipCall__Inputs {
     return new TransferOwnershipCall__Inputs(this);
@@ -842,16 +1418,46 @@ export class WithdrawContributionCall__Inputs {
   constructor(call: WithdrawContributionCall) {
     this._call = call;
   }
+}
+
+export class WithdrawContributionCall__Outputs {
+  _call: WithdrawContributionCall;
+
+  constructor(call: WithdrawContributionCall) {
+    this._call = call;
+  }
+}
+
+export class WithdrawContributionsCall extends ethereum.Call {
+  get inputs(): WithdrawContributionsCall__Inputs {
+    return new WithdrawContributionsCall__Inputs(this);
+  }
+
+  get outputs(): WithdrawContributionsCall__Outputs {
+    return new WithdrawContributionsCall__Outputs(this);
+  }
+}
+
+export class WithdrawContributionsCall__Inputs {
+  _call: WithdrawContributionsCall;
+
+  constructor(call: WithdrawContributionsCall) {
+    this._call = call;
+  }
 
   get _contributors(): Array<Address> {
     return this._call.inputValues[0].value.toAddressArray();
   }
 }
 
-export class WithdrawContributionCall__Outputs {
-  _call: WithdrawContributionCall;
+export class WithdrawContributionsCall__Outputs {
+  _call: WithdrawContributionsCall;
 
-  constructor(call: WithdrawContributionCall) {
+  constructor(call: WithdrawContributionsCall) {
     this._call = call;
   }
+
+  get result(): Array<boolean> {
+    return this._call.outputValues[0].value.toBooleanArray();
+  }
 }
diff --git a/subgraph/generated/schema.ts b/subgraph/generated/schema.ts
index f611654e8..19867639a 100644
--- a/subgraph/generated/schema.ts
+++ b/subgraph/generated/schema.ts
@@ -2123,6 +2123,23 @@ export class Contribution extends Entity {
       this.set("createdAt", Value.fromString(<string>value));
     }
   }
+
+  get lastUpdatedAt(): string | null {
+    let value = this.get("lastUpdatedAt");
+    if (!value || value.kind == ValueKind.NULL) {
+      return null;
+    } else {
+      return value.toString();
+    }
+  }
+
+  set lastUpdatedAt(value: string | null) {
+    if (!value) {
+      this.unset("lastUpdatedAt");
+    } else {
+      this.set("lastUpdatedAt", Value.fromString(<string>value));
+    }
+  }
 }
 
 export class Vote extends Entity {
diff --git a/subgraph/generated/templates/FundingRound/FundingRound.ts b/subgraph/generated/templates/FundingRound/FundingRound.ts
index e86a75ef4..194e40e1d 100644
--- a/subgraph/generated/templates/FundingRound/FundingRound.ts
+++ b/subgraph/generated/templates/FundingRound/FundingRound.ts
@@ -98,6 +98,24 @@ export class OwnershipTransferred__Params {
   }
 }
 
+export class PollSet extends ethereum.Event {
+  get params(): PollSet__Params {
+    return new PollSet__Params(this);
+  }
+}
+
+export class PollSet__Params {
+  _event: PollSet;
+
+  constructor(event: PollSet) {
+    this._event = event;
+  }
+
+  get _poll(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+}
+
 export class TallyPublished extends ethereum.Event {
   get params(): TallyPublished__Params {
     return new TallyPublished__Params(this);
@@ -116,6 +134,68 @@ export class TallyPublished__Params {
   }
 }
 
+export class TallyResultsAdded extends ethereum.Event {
+  get params(): TallyResultsAdded__Params {
+    return new TallyResultsAdded__Params(this);
+  }
+}
+
+export class TallyResultsAdded__Params {
+  _event: TallyResultsAdded;
+
+  constructor(event: TallyResultsAdded) {
+    this._event = event;
+  }
+
+  get _voteOptionIndex(): BigInt {
+    return this._event.parameters[0].value.toBigInt();
+  }
+
+  get _tally(): BigInt {
+    return this._event.parameters[1].value.toBigInt();
+  }
+}
+
+export class TallySet extends ethereum.Event {
+  get params(): TallySet__Params {
+    return new TallySet__Params(this);
+  }
+}
+
+export class TallySet__Params {
+  _event: TallySet;
+
+  constructor(event: TallySet) {
+    this._event = event;
+  }
+
+  get _tally(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+}
+
+export class Topup extends ethereum.Event {
+  get params(): Topup__Params {
+    return new Topup__Params(this);
+  }
+}
+
+export class Topup__Params {
+  _event: Topup;
+
+  constructor(event: Topup) {
+    this._event = event;
+  }
+
+  get _sender(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+
+  get _amount(): BigInt {
+    return this._event.parameters[1].value.toBigInt();
+  }
+}
+
 export class Voted extends ethereum.Event {
   get params(): Voted__Params {
     return new Voted__Params(this);
@@ -134,11 +214,145 @@ export class Voted__Params {
   }
 }
 
+export class FundingRound__contributorsResult {
+  value0: BigInt;
+  value1: boolean;
+
+  constructor(value0: BigInt, value1: boolean) {
+    this.value0 = value0;
+    this.value1 = value1;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0));
+    map.set("value1", ethereum.Value.fromBoolean(this.value1));
+    return map;
+  }
+
+  getAmount(): BigInt {
+    return this.value0;
+  }
+
+  getIsRegistered(): boolean {
+    return this.value1;
+  }
+}
+
+export class FundingRound__recipientsResult {
+  value0: boolean;
+  value1: boolean;
+  value2: BigInt;
+
+  constructor(value0: boolean, value1: boolean, value2: BigInt) {
+    this.value0 = value0;
+    this.value1 = value1;
+    this.value2 = value2;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromBoolean(this.value0));
+    map.set("value1", ethereum.Value.fromBoolean(this.value1));
+    map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2));
+    return map;
+  }
+
+  getFundsClaimed(): boolean {
+    return this.value0;
+  }
+
+  getTallyVerified(): boolean {
+    return this.value1;
+  }
+
+  getTallyResult(): BigInt {
+    return this.value2;
+  }
+}
+
 export class FundingRound extends ethereum.SmartContract {
   static bind(address: Address): FundingRound {
     return new FundingRound("FundingRound", address);
   }
 
+  MESSAGE_DATA_LENGTH(): i32 {
+    let result = super.call(
+      "MESSAGE_DATA_LENGTH",
+      "MESSAGE_DATA_LENGTH():(uint8)",
+      []
+    );
+
+    return result[0].toI32();
+  }
+
+  try_MESSAGE_DATA_LENGTH(): ethereum.CallResult<i32> {
+    let result = super.tryCall(
+      "MESSAGE_DATA_LENGTH",
+      "MESSAGE_DATA_LENGTH():(uint8)",
+      []
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toI32());
+  }
+
+  alpha(): BigInt {
+    let result = super.call("alpha", "alpha():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_alpha(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("alpha", "alpha():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
+  calcAlpha(
+    _budget: BigInt,
+    _totalVotesSquares: BigInt,
+    _totalSpent: BigInt
+  ): BigInt {
+    let result = super.call(
+      "calcAlpha",
+      "calcAlpha(uint256,uint256,uint256):(uint256)",
+      [
+        ethereum.Value.fromUnsignedBigInt(_budget),
+        ethereum.Value.fromUnsignedBigInt(_totalVotesSquares),
+        ethereum.Value.fromUnsignedBigInt(_totalSpent)
+      ]
+    );
+
+    return result[0].toBigInt();
+  }
+
+  try_calcAlpha(
+    _budget: BigInt,
+    _totalVotesSquares: BigInt,
+    _totalSpent: BigInt
+  ): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "calcAlpha",
+      "calcAlpha(uint256,uint256,uint256):(uint256)",
+      [
+        ethereum.Value.fromUnsignedBigInt(_budget),
+        ethereum.Value.fromUnsignedBigInt(_totalVotesSquares),
+        ethereum.Value.fromUnsignedBigInt(_totalSpent)
+      ]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   contributorCount(): BigInt {
     let result = super.call(
       "contributorCount",
@@ -162,6 +376,39 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  contributors(param0: Address): FundingRound__contributorsResult {
+    let result = super.call(
+      "contributors",
+      "contributors(address):(uint256,bool)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+
+    return new FundingRound__contributorsResult(
+      result[0].toBigInt(),
+      result[1].toBoolean()
+    );
+  }
+
+  try_contributors(
+    param0: Address
+  ): ethereum.CallResult<FundingRound__contributorsResult> {
+    let result = super.tryCall(
+      "contributors",
+      "contributors(address):(uint256,bool)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new FundingRound__contributorsResult(
+        value[0].toBigInt(),
+        value[1].toBoolean()
+      )
+    );
+  }
+
   coordinator(): Address {
     let result = super.call("coordinator", "coordinator():(address)", []);
 
@@ -235,6 +482,27 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  isAddressZero(addressValue: Address): boolean {
+    let result = super.call("isAddressZero", "isAddressZero(address):(bool)", [
+      ethereum.Value.fromAddress(addressValue)
+    ]);
+
+    return result[0].toBoolean();
+  }
+
+  try_isAddressZero(addressValue: Address): ethereum.CallResult<boolean> {
+    let result = super.tryCall(
+      "isAddressZero",
+      "isAddressZero(address):(bool)",
+      [ethereum.Value.fromAddress(addressValue)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBoolean());
+  }
+
   isCancelled(): boolean {
     let result = super.call("isCancelled", "isCancelled():(bool)", []);
 
@@ -333,6 +601,36 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  poll(): Address {
+    let result = super.call("poll", "poll():(address)", []);
+
+    return result[0].toAddress();
+  }
+
+  try_poll(): ethereum.CallResult<Address> {
+    let result = super.tryCall("poll", "poll():(address)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toAddress());
+  }
+
+  pollId(): BigInt {
+    let result = super.call("pollId", "pollId():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_pollId(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   recipientRegistry(): Address {
     let result = super.call(
       "recipientRegistry",
@@ -356,6 +654,56 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  recipients(param0: BigInt): FundingRound__recipientsResult {
+    let result = super.call(
+      "recipients",
+      "recipients(uint256):(bool,bool,uint256)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+
+    return new FundingRound__recipientsResult(
+      result[0].toBoolean(),
+      result[1].toBoolean(),
+      result[2].toBigInt()
+    );
+  }
+
+  try_recipients(
+    param0: BigInt
+  ): ethereum.CallResult<FundingRound__recipientsResult> {
+    let result = super.tryCall(
+      "recipients",
+      "recipients(uint256):(bool,bool,uint256)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new FundingRound__recipientsResult(
+        value[0].toBoolean(),
+        value[1].toBoolean(),
+        value[2].toBigInt()
+      )
+    );
+  }
+
+  tally(): Address {
+    let result = super.call("tally", "tally():(address)", []);
+
+    return result[0].toAddress();
+  }
+
+  try_tally(): ethereum.CallResult<Address> {
+    let result = super.tryCall("tally", "tally():(address)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toAddress());
+  }
+
   tallyHash(): string {
     let result = super.call("tallyHash", "tallyHash():(string)", []);
 
@@ -371,14 +719,14 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toString());
   }
 
-  poll(): Address {
-    let result = super.call("poll", "poll():(address)", []);
+  topupToken(): Address {
+    let result = super.call("topupToken", "topupToken():(address)", []);
 
     return result[0].toAddress();
   }
 
-  try_poll(): ethereum.CallResult<Address> {
-    let result = super.tryCall("poll", "poll():(address)", []);
+  try_topupToken(): ethereum.CallResult<Address> {
+    let result = super.tryCall("topupToken", "topupToken():(address)", []);
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -386,14 +734,14 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
-  pollId(): BigInt {
-    let result = super.call("pollId", "pollId():(uint256)", []);
+  totalSpent(): BigInt {
+    let result = super.call("totalSpent", "totalSpent():(uint256)", []);
 
     return result[0].toBigInt();
   }
 
-  try_pollId(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+  try_totalSpent(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("totalSpent", "totalSpent():(uint256)", []);
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -401,14 +749,22 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
-  totalSpent(): BigInt {
-    let result = super.call("totalSpent", "totalSpent():(uint256)", []);
+  totalTallyResults(): BigInt {
+    let result = super.call(
+      "totalTallyResults",
+      "totalTallyResults():(uint256)",
+      []
+    );
 
     return result[0].toBigInt();
   }
 
-  try_totalSpent(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("totalSpent", "totalSpent():(uint256)", []);
+  try_totalTallyResults(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "totalTallyResults",
+      "totalTallyResults():(uint256)",
+      []
+    );
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -431,6 +787,29 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  totalVotesSquares(): BigInt {
+    let result = super.call(
+      "totalVotesSquares",
+      "totalVotesSquares():(uint256)",
+      []
+    );
+
+    return result[0].toBigInt();
+  }
+
+  try_totalVotesSquares(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "totalVotesSquares",
+      "totalVotesSquares():(uint256)",
+      []
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   userRegistry(): Address {
     let result = super.call("userRegistry", "userRegistry():(address)", []);
 
@@ -468,6 +847,31 @@ export class FundingRound extends ethereum.SmartContract {
     let value = result.value;
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
+
+  withdrawContributions(_contributors: Array<Address>): Array<boolean> {
+    let result = super.call(
+      "withdrawContributions",
+      "withdrawContributions(address[]):(bool[])",
+      [ethereum.Value.fromAddressArray(_contributors)]
+    );
+
+    return result[0].toBooleanArray();
+  }
+
+  try_withdrawContributions(
+    _contributors: Array<Address>
+  ): ethereum.CallResult<Array<boolean>> {
+    let result = super.tryCall(
+      "withdrawContributions",
+      "withdrawContributions(address[]):(bool[])",
+      [ethereum.Value.fromAddressArray(_contributors)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBooleanArray());
+  }
 }
 
 export class ConstructorCall extends ethereum.Call {
@@ -538,6 +942,56 @@ export class CancelCall__Outputs {
   }
 }
 
+export class ClaimFundsCall extends ethereum.Call {
+  get inputs(): ClaimFundsCall__Inputs {
+    return new ClaimFundsCall__Inputs(this);
+  }
+
+  get outputs(): ClaimFundsCall__Outputs {
+    return new ClaimFundsCall__Outputs(this);
+  }
+}
+
+export class ClaimFundsCall__Inputs {
+  _call: ClaimFundsCall;
+
+  constructor(call: ClaimFundsCall) {
+    this._call = call;
+  }
+
+  get _voteOptionIndex(): BigInt {
+    return this._call.inputValues[0].value.toBigInt();
+  }
+
+  get _spent(): BigInt {
+    return this._call.inputValues[1].value.toBigInt();
+  }
+
+  get _spentProof(): Array<Array<BigInt>> {
+    return this._call.inputValues[2].value.toBigIntMatrix();
+  }
+
+  get _spentSalt(): BigInt {
+    return this._call.inputValues[3].value.toBigInt();
+  }
+
+  get _resultsCommitment(): BigInt {
+    return this._call.inputValues[4].value.toBigInt();
+  }
+
+  get _spentVoiceCreditsCommitment(): BigInt {
+    return this._call.inputValues[5].value.toBigInt();
+  }
+}
+
+export class ClaimFundsCall__Outputs {
+  _call: ClaimFundsCall;
+
+  constructor(call: ClaimFundsCall) {
+    this._call = call;
+  }
+}
+
 export class ContributeCall extends ethereum.Call {
   get inputs(): ContributeCall__Inputs {
     return new ContributeCall__Inputs(this);
@@ -608,6 +1062,14 @@ export class FinalizeCall__Inputs {
   get _totalSpentSalt(): BigInt {
     return this._call.inputValues[1].value.toBigInt();
   }
+
+  get _newResultCommitment(): BigInt {
+    return this._call.inputValues[2].value.toBigInt();
+  }
+
+  get _perVOSpentVoiceCreditsHash(): BigInt {
+    return this._call.inputValues[3].value.toBigInt();
+  }
 }
 
 export class FinalizeCall__Outputs {
@@ -708,6 +1170,32 @@ export class RenounceOwnershipCall__Outputs {
   }
 }
 
+export class ResetTallyCall extends ethereum.Call {
+  get inputs(): ResetTallyCall__Inputs {
+    return new ResetTallyCall__Inputs(this);
+  }
+
+  get outputs(): ResetTallyCall__Outputs {
+    return new ResetTallyCall__Outputs(this);
+  }
+}
+
+export class ResetTallyCall__Inputs {
+  _call: ResetTallyCall;
+
+  constructor(call: ResetTallyCall) {
+    this._call = call;
+  }
+}
+
+export class ResetTallyCall__Outputs {
+  _call: ResetTallyCall;
+
+  constructor(call: ResetTallyCall) {
+    this._call = call;
+  }
+}
+
 export class SetMaciCall extends ethereum.Call {
   get inputs(): SetMaciCall__Inputs {
     return new SetMaciCall__Inputs(this);
@@ -728,6 +1216,12 @@ export class SetMaciCall__Inputs {
   get _maci(): Address {
     return this._call.inputValues[0].value.toAddress();
   }
+
+  get _pollContracts(): SetMaciCall_pollContractsStruct {
+    return changetype<SetMaciCall_pollContractsStruct>(
+      this._call.inputValues[1].value.toTuple()
+    );
+  }
 }
 
 export class SetMaciCall__Outputs {
@@ -738,6 +1232,54 @@ export class SetMaciCall__Outputs {
   }
 }
 
+export class SetMaciCall_pollContractsStruct extends ethereum.Tuple {
+  get poll(): Address {
+    return this[0].toAddress();
+  }
+
+  get messageProcessor(): Address {
+    return this[1].toAddress();
+  }
+
+  get tally(): Address {
+    return this[2].toAddress();
+  }
+
+  get subsidy(): Address {
+    return this[3].toAddress();
+  }
+}
+
+export class SetMaciInstanceCall extends ethereum.Call {
+  get inputs(): SetMaciInstanceCall__Inputs {
+    return new SetMaciInstanceCall__Inputs(this);
+  }
+
+  get outputs(): SetMaciInstanceCall__Outputs {
+    return new SetMaciInstanceCall__Outputs(this);
+  }
+}
+
+export class SetMaciInstanceCall__Inputs {
+  _call: SetMaciInstanceCall;
+
+  constructor(call: SetMaciInstanceCall) {
+    this._call = call;
+  }
+
+  get _maci(): Address {
+    return this._call.inputValues[0].value.toAddress();
+  }
+}
+
+export class SetMaciInstanceCall__Outputs {
+  _call: SetMaciInstanceCall;
+
+  constructor(call: SetMaciInstanceCall) {
+    this._call = call;
+  }
+}
+
 export class SubmitMessageBatchCall extends ethereum.Call {
   get inputs(): SubmitMessageBatchCall__Inputs {
     return new SubmitMessageBatchCall__Inputs(this);
@@ -777,7 +1319,7 @@ export class SubmitMessageBatchCall__Outputs {
 }
 
 export class SubmitMessageBatchCall_messagesStruct extends ethereum.Tuple {
-  get iv(): BigInt {
+  get msgType(): BigInt {
     return this[0].toBigInt();
   }
 
@@ -796,6 +1338,40 @@ export class SubmitMessageBatchCall_encPubKeysStruct extends ethereum.Tuple {
   }
 }
 
+export class TopupCall extends ethereum.Call {
+  get inputs(): TopupCall__Inputs {
+    return new TopupCall__Inputs(this);
+  }
+
+  get outputs(): TopupCall__Outputs {
+    return new TopupCall__Outputs(this);
+  }
+}
+
+export class TopupCall__Inputs {
+  _call: TopupCall;
+
+  constructor(call: TopupCall) {
+    this._call = call;
+  }
+
+  get stateIndex(): BigInt {
+    return this._call.inputValues[0].value.toBigInt();
+  }
+
+  get amount(): BigInt {
+    return this._call.inputValues[1].value.toBigInt();
+  }
+}
+
+export class TopupCall__Outputs {
+  _call: TopupCall;
+
+  constructor(call: TopupCall) {
+    this._call = call;
+  }
+}
+
 export class TransferOwnershipCall extends ethereum.Call {
   get inputs(): TransferOwnershipCall__Inputs {
     return new TransferOwnershipCall__Inputs(this);
@@ -842,16 +1418,46 @@ export class WithdrawContributionCall__Inputs {
   constructor(call: WithdrawContributionCall) {
     this._call = call;
   }
+}
+
+export class WithdrawContributionCall__Outputs {
+  _call: WithdrawContributionCall;
+
+  constructor(call: WithdrawContributionCall) {
+    this._call = call;
+  }
+}
+
+export class WithdrawContributionsCall extends ethereum.Call {
+  get inputs(): WithdrawContributionsCall__Inputs {
+    return new WithdrawContributionsCall__Inputs(this);
+  }
+
+  get outputs(): WithdrawContributionsCall__Outputs {
+    return new WithdrawContributionsCall__Outputs(this);
+  }
+}
+
+export class WithdrawContributionsCall__Inputs {
+  _call: WithdrawContributionsCall;
+
+  constructor(call: WithdrawContributionsCall) {
+    this._call = call;
+  }
 
   get _contributors(): Array<Address> {
     return this._call.inputValues[0].value.toAddressArray();
   }
 }
 
-export class WithdrawContributionCall__Outputs {
-  _call: WithdrawContributionCall;
+export class WithdrawContributionsCall__Outputs {
+  _call: WithdrawContributionsCall;
 
-  constructor(call: WithdrawContributionCall) {
+  constructor(call: WithdrawContributionsCall) {
     this._call = call;
   }
+
+  get result(): Array<boolean> {
+    return this._call.outputValues[0].value.toBooleanArray();
+  }
 }
diff --git a/subgraph/generated/templates/MACI/FundingRound.ts b/subgraph/generated/templates/MACI/FundingRound.ts
index e86a75ef4..194e40e1d 100644
--- a/subgraph/generated/templates/MACI/FundingRound.ts
+++ b/subgraph/generated/templates/MACI/FundingRound.ts
@@ -98,6 +98,24 @@ export class OwnershipTransferred__Params {
   }
 }
 
+export class PollSet extends ethereum.Event {
+  get params(): PollSet__Params {
+    return new PollSet__Params(this);
+  }
+}
+
+export class PollSet__Params {
+  _event: PollSet;
+
+  constructor(event: PollSet) {
+    this._event = event;
+  }
+
+  get _poll(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+}
+
 export class TallyPublished extends ethereum.Event {
   get params(): TallyPublished__Params {
     return new TallyPublished__Params(this);
@@ -116,6 +134,68 @@ export class TallyPublished__Params {
   }
 }
 
+export class TallyResultsAdded extends ethereum.Event {
+  get params(): TallyResultsAdded__Params {
+    return new TallyResultsAdded__Params(this);
+  }
+}
+
+export class TallyResultsAdded__Params {
+  _event: TallyResultsAdded;
+
+  constructor(event: TallyResultsAdded) {
+    this._event = event;
+  }
+
+  get _voteOptionIndex(): BigInt {
+    return this._event.parameters[0].value.toBigInt();
+  }
+
+  get _tally(): BigInt {
+    return this._event.parameters[1].value.toBigInt();
+  }
+}
+
+export class TallySet extends ethereum.Event {
+  get params(): TallySet__Params {
+    return new TallySet__Params(this);
+  }
+}
+
+export class TallySet__Params {
+  _event: TallySet;
+
+  constructor(event: TallySet) {
+    this._event = event;
+  }
+
+  get _tally(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+}
+
+export class Topup extends ethereum.Event {
+  get params(): Topup__Params {
+    return new Topup__Params(this);
+  }
+}
+
+export class Topup__Params {
+  _event: Topup;
+
+  constructor(event: Topup) {
+    this._event = event;
+  }
+
+  get _sender(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+
+  get _amount(): BigInt {
+    return this._event.parameters[1].value.toBigInt();
+  }
+}
+
 export class Voted extends ethereum.Event {
   get params(): Voted__Params {
     return new Voted__Params(this);
@@ -134,11 +214,145 @@ export class Voted__Params {
   }
 }
 
+export class FundingRound__contributorsResult {
+  value0: BigInt;
+  value1: boolean;
+
+  constructor(value0: BigInt, value1: boolean) {
+    this.value0 = value0;
+    this.value1 = value1;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0));
+    map.set("value1", ethereum.Value.fromBoolean(this.value1));
+    return map;
+  }
+
+  getAmount(): BigInt {
+    return this.value0;
+  }
+
+  getIsRegistered(): boolean {
+    return this.value1;
+  }
+}
+
+export class FundingRound__recipientsResult {
+  value0: boolean;
+  value1: boolean;
+  value2: BigInt;
+
+  constructor(value0: boolean, value1: boolean, value2: BigInt) {
+    this.value0 = value0;
+    this.value1 = value1;
+    this.value2 = value2;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromBoolean(this.value0));
+    map.set("value1", ethereum.Value.fromBoolean(this.value1));
+    map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2));
+    return map;
+  }
+
+  getFundsClaimed(): boolean {
+    return this.value0;
+  }
+
+  getTallyVerified(): boolean {
+    return this.value1;
+  }
+
+  getTallyResult(): BigInt {
+    return this.value2;
+  }
+}
+
 export class FundingRound extends ethereum.SmartContract {
   static bind(address: Address): FundingRound {
     return new FundingRound("FundingRound", address);
   }
 
+  MESSAGE_DATA_LENGTH(): i32 {
+    let result = super.call(
+      "MESSAGE_DATA_LENGTH",
+      "MESSAGE_DATA_LENGTH():(uint8)",
+      []
+    );
+
+    return result[0].toI32();
+  }
+
+  try_MESSAGE_DATA_LENGTH(): ethereum.CallResult<i32> {
+    let result = super.tryCall(
+      "MESSAGE_DATA_LENGTH",
+      "MESSAGE_DATA_LENGTH():(uint8)",
+      []
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toI32());
+  }
+
+  alpha(): BigInt {
+    let result = super.call("alpha", "alpha():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_alpha(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("alpha", "alpha():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
+  calcAlpha(
+    _budget: BigInt,
+    _totalVotesSquares: BigInt,
+    _totalSpent: BigInt
+  ): BigInt {
+    let result = super.call(
+      "calcAlpha",
+      "calcAlpha(uint256,uint256,uint256):(uint256)",
+      [
+        ethereum.Value.fromUnsignedBigInt(_budget),
+        ethereum.Value.fromUnsignedBigInt(_totalVotesSquares),
+        ethereum.Value.fromUnsignedBigInt(_totalSpent)
+      ]
+    );
+
+    return result[0].toBigInt();
+  }
+
+  try_calcAlpha(
+    _budget: BigInt,
+    _totalVotesSquares: BigInt,
+    _totalSpent: BigInt
+  ): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "calcAlpha",
+      "calcAlpha(uint256,uint256,uint256):(uint256)",
+      [
+        ethereum.Value.fromUnsignedBigInt(_budget),
+        ethereum.Value.fromUnsignedBigInt(_totalVotesSquares),
+        ethereum.Value.fromUnsignedBigInt(_totalSpent)
+      ]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   contributorCount(): BigInt {
     let result = super.call(
       "contributorCount",
@@ -162,6 +376,39 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  contributors(param0: Address): FundingRound__contributorsResult {
+    let result = super.call(
+      "contributors",
+      "contributors(address):(uint256,bool)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+
+    return new FundingRound__contributorsResult(
+      result[0].toBigInt(),
+      result[1].toBoolean()
+    );
+  }
+
+  try_contributors(
+    param0: Address
+  ): ethereum.CallResult<FundingRound__contributorsResult> {
+    let result = super.tryCall(
+      "contributors",
+      "contributors(address):(uint256,bool)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new FundingRound__contributorsResult(
+        value[0].toBigInt(),
+        value[1].toBoolean()
+      )
+    );
+  }
+
   coordinator(): Address {
     let result = super.call("coordinator", "coordinator():(address)", []);
 
@@ -235,6 +482,27 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  isAddressZero(addressValue: Address): boolean {
+    let result = super.call("isAddressZero", "isAddressZero(address):(bool)", [
+      ethereum.Value.fromAddress(addressValue)
+    ]);
+
+    return result[0].toBoolean();
+  }
+
+  try_isAddressZero(addressValue: Address): ethereum.CallResult<boolean> {
+    let result = super.tryCall(
+      "isAddressZero",
+      "isAddressZero(address):(bool)",
+      [ethereum.Value.fromAddress(addressValue)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBoolean());
+  }
+
   isCancelled(): boolean {
     let result = super.call("isCancelled", "isCancelled():(bool)", []);
 
@@ -333,6 +601,36 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  poll(): Address {
+    let result = super.call("poll", "poll():(address)", []);
+
+    return result[0].toAddress();
+  }
+
+  try_poll(): ethereum.CallResult<Address> {
+    let result = super.tryCall("poll", "poll():(address)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toAddress());
+  }
+
+  pollId(): BigInt {
+    let result = super.call("pollId", "pollId():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_pollId(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   recipientRegistry(): Address {
     let result = super.call(
       "recipientRegistry",
@@ -356,6 +654,56 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  recipients(param0: BigInt): FundingRound__recipientsResult {
+    let result = super.call(
+      "recipients",
+      "recipients(uint256):(bool,bool,uint256)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+
+    return new FundingRound__recipientsResult(
+      result[0].toBoolean(),
+      result[1].toBoolean(),
+      result[2].toBigInt()
+    );
+  }
+
+  try_recipients(
+    param0: BigInt
+  ): ethereum.CallResult<FundingRound__recipientsResult> {
+    let result = super.tryCall(
+      "recipients",
+      "recipients(uint256):(bool,bool,uint256)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new FundingRound__recipientsResult(
+        value[0].toBoolean(),
+        value[1].toBoolean(),
+        value[2].toBigInt()
+      )
+    );
+  }
+
+  tally(): Address {
+    let result = super.call("tally", "tally():(address)", []);
+
+    return result[0].toAddress();
+  }
+
+  try_tally(): ethereum.CallResult<Address> {
+    let result = super.tryCall("tally", "tally():(address)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toAddress());
+  }
+
   tallyHash(): string {
     let result = super.call("tallyHash", "tallyHash():(string)", []);
 
@@ -371,14 +719,14 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toString());
   }
 
-  poll(): Address {
-    let result = super.call("poll", "poll():(address)", []);
+  topupToken(): Address {
+    let result = super.call("topupToken", "topupToken():(address)", []);
 
     return result[0].toAddress();
   }
 
-  try_poll(): ethereum.CallResult<Address> {
-    let result = super.tryCall("poll", "poll():(address)", []);
+  try_topupToken(): ethereum.CallResult<Address> {
+    let result = super.tryCall("topupToken", "topupToken():(address)", []);
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -386,14 +734,14 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
-  pollId(): BigInt {
-    let result = super.call("pollId", "pollId():(uint256)", []);
+  totalSpent(): BigInt {
+    let result = super.call("totalSpent", "totalSpent():(uint256)", []);
 
     return result[0].toBigInt();
   }
 
-  try_pollId(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+  try_totalSpent(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("totalSpent", "totalSpent():(uint256)", []);
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -401,14 +749,22 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
-  totalSpent(): BigInt {
-    let result = super.call("totalSpent", "totalSpent():(uint256)", []);
+  totalTallyResults(): BigInt {
+    let result = super.call(
+      "totalTallyResults",
+      "totalTallyResults():(uint256)",
+      []
+    );
 
     return result[0].toBigInt();
   }
 
-  try_totalSpent(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("totalSpent", "totalSpent():(uint256)", []);
+  try_totalTallyResults(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "totalTallyResults",
+      "totalTallyResults():(uint256)",
+      []
+    );
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -431,6 +787,29 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  totalVotesSquares(): BigInt {
+    let result = super.call(
+      "totalVotesSquares",
+      "totalVotesSquares():(uint256)",
+      []
+    );
+
+    return result[0].toBigInt();
+  }
+
+  try_totalVotesSquares(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "totalVotesSquares",
+      "totalVotesSquares():(uint256)",
+      []
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   userRegistry(): Address {
     let result = super.call("userRegistry", "userRegistry():(address)", []);
 
@@ -468,6 +847,31 @@ export class FundingRound extends ethereum.SmartContract {
     let value = result.value;
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
+
+  withdrawContributions(_contributors: Array<Address>): Array<boolean> {
+    let result = super.call(
+      "withdrawContributions",
+      "withdrawContributions(address[]):(bool[])",
+      [ethereum.Value.fromAddressArray(_contributors)]
+    );
+
+    return result[0].toBooleanArray();
+  }
+
+  try_withdrawContributions(
+    _contributors: Array<Address>
+  ): ethereum.CallResult<Array<boolean>> {
+    let result = super.tryCall(
+      "withdrawContributions",
+      "withdrawContributions(address[]):(bool[])",
+      [ethereum.Value.fromAddressArray(_contributors)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBooleanArray());
+  }
 }
 
 export class ConstructorCall extends ethereum.Call {
@@ -538,6 +942,56 @@ export class CancelCall__Outputs {
   }
 }
 
+export class ClaimFundsCall extends ethereum.Call {
+  get inputs(): ClaimFundsCall__Inputs {
+    return new ClaimFundsCall__Inputs(this);
+  }
+
+  get outputs(): ClaimFundsCall__Outputs {
+    return new ClaimFundsCall__Outputs(this);
+  }
+}
+
+export class ClaimFundsCall__Inputs {
+  _call: ClaimFundsCall;
+
+  constructor(call: ClaimFundsCall) {
+    this._call = call;
+  }
+
+  get _voteOptionIndex(): BigInt {
+    return this._call.inputValues[0].value.toBigInt();
+  }
+
+  get _spent(): BigInt {
+    return this._call.inputValues[1].value.toBigInt();
+  }
+
+  get _spentProof(): Array<Array<BigInt>> {
+    return this._call.inputValues[2].value.toBigIntMatrix();
+  }
+
+  get _spentSalt(): BigInt {
+    return this._call.inputValues[3].value.toBigInt();
+  }
+
+  get _resultsCommitment(): BigInt {
+    return this._call.inputValues[4].value.toBigInt();
+  }
+
+  get _spentVoiceCreditsCommitment(): BigInt {
+    return this._call.inputValues[5].value.toBigInt();
+  }
+}
+
+export class ClaimFundsCall__Outputs {
+  _call: ClaimFundsCall;
+
+  constructor(call: ClaimFundsCall) {
+    this._call = call;
+  }
+}
+
 export class ContributeCall extends ethereum.Call {
   get inputs(): ContributeCall__Inputs {
     return new ContributeCall__Inputs(this);
@@ -608,6 +1062,14 @@ export class FinalizeCall__Inputs {
   get _totalSpentSalt(): BigInt {
     return this._call.inputValues[1].value.toBigInt();
   }
+
+  get _newResultCommitment(): BigInt {
+    return this._call.inputValues[2].value.toBigInt();
+  }
+
+  get _perVOSpentVoiceCreditsHash(): BigInt {
+    return this._call.inputValues[3].value.toBigInt();
+  }
 }
 
 export class FinalizeCall__Outputs {
@@ -708,6 +1170,32 @@ export class RenounceOwnershipCall__Outputs {
   }
 }
 
+export class ResetTallyCall extends ethereum.Call {
+  get inputs(): ResetTallyCall__Inputs {
+    return new ResetTallyCall__Inputs(this);
+  }
+
+  get outputs(): ResetTallyCall__Outputs {
+    return new ResetTallyCall__Outputs(this);
+  }
+}
+
+export class ResetTallyCall__Inputs {
+  _call: ResetTallyCall;
+
+  constructor(call: ResetTallyCall) {
+    this._call = call;
+  }
+}
+
+export class ResetTallyCall__Outputs {
+  _call: ResetTallyCall;
+
+  constructor(call: ResetTallyCall) {
+    this._call = call;
+  }
+}
+
 export class SetMaciCall extends ethereum.Call {
   get inputs(): SetMaciCall__Inputs {
     return new SetMaciCall__Inputs(this);
@@ -728,6 +1216,12 @@ export class SetMaciCall__Inputs {
   get _maci(): Address {
     return this._call.inputValues[0].value.toAddress();
   }
+
+  get _pollContracts(): SetMaciCall_pollContractsStruct {
+    return changetype<SetMaciCall_pollContractsStruct>(
+      this._call.inputValues[1].value.toTuple()
+    );
+  }
 }
 
 export class SetMaciCall__Outputs {
@@ -738,6 +1232,54 @@ export class SetMaciCall__Outputs {
   }
 }
 
+export class SetMaciCall_pollContractsStruct extends ethereum.Tuple {
+  get poll(): Address {
+    return this[0].toAddress();
+  }
+
+  get messageProcessor(): Address {
+    return this[1].toAddress();
+  }
+
+  get tally(): Address {
+    return this[2].toAddress();
+  }
+
+  get subsidy(): Address {
+    return this[3].toAddress();
+  }
+}
+
+export class SetMaciInstanceCall extends ethereum.Call {
+  get inputs(): SetMaciInstanceCall__Inputs {
+    return new SetMaciInstanceCall__Inputs(this);
+  }
+
+  get outputs(): SetMaciInstanceCall__Outputs {
+    return new SetMaciInstanceCall__Outputs(this);
+  }
+}
+
+export class SetMaciInstanceCall__Inputs {
+  _call: SetMaciInstanceCall;
+
+  constructor(call: SetMaciInstanceCall) {
+    this._call = call;
+  }
+
+  get _maci(): Address {
+    return this._call.inputValues[0].value.toAddress();
+  }
+}
+
+export class SetMaciInstanceCall__Outputs {
+  _call: SetMaciInstanceCall;
+
+  constructor(call: SetMaciInstanceCall) {
+    this._call = call;
+  }
+}
+
 export class SubmitMessageBatchCall extends ethereum.Call {
   get inputs(): SubmitMessageBatchCall__Inputs {
     return new SubmitMessageBatchCall__Inputs(this);
@@ -777,7 +1319,7 @@ export class SubmitMessageBatchCall__Outputs {
 }
 
 export class SubmitMessageBatchCall_messagesStruct extends ethereum.Tuple {
-  get iv(): BigInt {
+  get msgType(): BigInt {
     return this[0].toBigInt();
   }
 
@@ -796,6 +1338,40 @@ export class SubmitMessageBatchCall_encPubKeysStruct extends ethereum.Tuple {
   }
 }
 
+export class TopupCall extends ethereum.Call {
+  get inputs(): TopupCall__Inputs {
+    return new TopupCall__Inputs(this);
+  }
+
+  get outputs(): TopupCall__Outputs {
+    return new TopupCall__Outputs(this);
+  }
+}
+
+export class TopupCall__Inputs {
+  _call: TopupCall;
+
+  constructor(call: TopupCall) {
+    this._call = call;
+  }
+
+  get stateIndex(): BigInt {
+    return this._call.inputValues[0].value.toBigInt();
+  }
+
+  get amount(): BigInt {
+    return this._call.inputValues[1].value.toBigInt();
+  }
+}
+
+export class TopupCall__Outputs {
+  _call: TopupCall;
+
+  constructor(call: TopupCall) {
+    this._call = call;
+  }
+}
+
 export class TransferOwnershipCall extends ethereum.Call {
   get inputs(): TransferOwnershipCall__Inputs {
     return new TransferOwnershipCall__Inputs(this);
@@ -842,16 +1418,46 @@ export class WithdrawContributionCall__Inputs {
   constructor(call: WithdrawContributionCall) {
     this._call = call;
   }
+}
+
+export class WithdrawContributionCall__Outputs {
+  _call: WithdrawContributionCall;
+
+  constructor(call: WithdrawContributionCall) {
+    this._call = call;
+  }
+}
+
+export class WithdrawContributionsCall extends ethereum.Call {
+  get inputs(): WithdrawContributionsCall__Inputs {
+    return new WithdrawContributionsCall__Inputs(this);
+  }
+
+  get outputs(): WithdrawContributionsCall__Outputs {
+    return new WithdrawContributionsCall__Outputs(this);
+  }
+}
+
+export class WithdrawContributionsCall__Inputs {
+  _call: WithdrawContributionsCall;
+
+  constructor(call: WithdrawContributionsCall) {
+    this._call = call;
+  }
 
   get _contributors(): Array<Address> {
     return this._call.inputValues[0].value.toAddressArray();
   }
 }
 
-export class WithdrawContributionCall__Outputs {
-  _call: WithdrawContributionCall;
+export class WithdrawContributionsCall__Outputs {
+  _call: WithdrawContributionsCall;
 
-  constructor(call: WithdrawContributionCall) {
+  constructor(call: WithdrawContributionsCall) {
     this._call = call;
   }
+
+  get result(): Array<boolean> {
+    return this._call.outputValues[0].value.toBooleanArray();
+  }
 }
diff --git a/subgraph/generated/templates/Poll/FundingRound.ts b/subgraph/generated/templates/Poll/FundingRound.ts
index e86a75ef4..194e40e1d 100644
--- a/subgraph/generated/templates/Poll/FundingRound.ts
+++ b/subgraph/generated/templates/Poll/FundingRound.ts
@@ -98,6 +98,24 @@ export class OwnershipTransferred__Params {
   }
 }
 
+export class PollSet extends ethereum.Event {
+  get params(): PollSet__Params {
+    return new PollSet__Params(this);
+  }
+}
+
+export class PollSet__Params {
+  _event: PollSet;
+
+  constructor(event: PollSet) {
+    this._event = event;
+  }
+
+  get _poll(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+}
+
 export class TallyPublished extends ethereum.Event {
   get params(): TallyPublished__Params {
     return new TallyPublished__Params(this);
@@ -116,6 +134,68 @@ export class TallyPublished__Params {
   }
 }
 
+export class TallyResultsAdded extends ethereum.Event {
+  get params(): TallyResultsAdded__Params {
+    return new TallyResultsAdded__Params(this);
+  }
+}
+
+export class TallyResultsAdded__Params {
+  _event: TallyResultsAdded;
+
+  constructor(event: TallyResultsAdded) {
+    this._event = event;
+  }
+
+  get _voteOptionIndex(): BigInt {
+    return this._event.parameters[0].value.toBigInt();
+  }
+
+  get _tally(): BigInt {
+    return this._event.parameters[1].value.toBigInt();
+  }
+}
+
+export class TallySet extends ethereum.Event {
+  get params(): TallySet__Params {
+    return new TallySet__Params(this);
+  }
+}
+
+export class TallySet__Params {
+  _event: TallySet;
+
+  constructor(event: TallySet) {
+    this._event = event;
+  }
+
+  get _tally(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+}
+
+export class Topup extends ethereum.Event {
+  get params(): Topup__Params {
+    return new Topup__Params(this);
+  }
+}
+
+export class Topup__Params {
+  _event: Topup;
+
+  constructor(event: Topup) {
+    this._event = event;
+  }
+
+  get _sender(): Address {
+    return this._event.parameters[0].value.toAddress();
+  }
+
+  get _amount(): BigInt {
+    return this._event.parameters[1].value.toBigInt();
+  }
+}
+
 export class Voted extends ethereum.Event {
   get params(): Voted__Params {
     return new Voted__Params(this);
@@ -134,11 +214,145 @@ export class Voted__Params {
   }
 }
 
+export class FundingRound__contributorsResult {
+  value0: BigInt;
+  value1: boolean;
+
+  constructor(value0: BigInt, value1: boolean) {
+    this.value0 = value0;
+    this.value1 = value1;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0));
+    map.set("value1", ethereum.Value.fromBoolean(this.value1));
+    return map;
+  }
+
+  getAmount(): BigInt {
+    return this.value0;
+  }
+
+  getIsRegistered(): boolean {
+    return this.value1;
+  }
+}
+
+export class FundingRound__recipientsResult {
+  value0: boolean;
+  value1: boolean;
+  value2: BigInt;
+
+  constructor(value0: boolean, value1: boolean, value2: BigInt) {
+    this.value0 = value0;
+    this.value1 = value1;
+    this.value2 = value2;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromBoolean(this.value0));
+    map.set("value1", ethereum.Value.fromBoolean(this.value1));
+    map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2));
+    return map;
+  }
+
+  getFundsClaimed(): boolean {
+    return this.value0;
+  }
+
+  getTallyVerified(): boolean {
+    return this.value1;
+  }
+
+  getTallyResult(): BigInt {
+    return this.value2;
+  }
+}
+
 export class FundingRound extends ethereum.SmartContract {
   static bind(address: Address): FundingRound {
     return new FundingRound("FundingRound", address);
   }
 
+  MESSAGE_DATA_LENGTH(): i32 {
+    let result = super.call(
+      "MESSAGE_DATA_LENGTH",
+      "MESSAGE_DATA_LENGTH():(uint8)",
+      []
+    );
+
+    return result[0].toI32();
+  }
+
+  try_MESSAGE_DATA_LENGTH(): ethereum.CallResult<i32> {
+    let result = super.tryCall(
+      "MESSAGE_DATA_LENGTH",
+      "MESSAGE_DATA_LENGTH():(uint8)",
+      []
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toI32());
+  }
+
+  alpha(): BigInt {
+    let result = super.call("alpha", "alpha():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_alpha(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("alpha", "alpha():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
+  calcAlpha(
+    _budget: BigInt,
+    _totalVotesSquares: BigInt,
+    _totalSpent: BigInt
+  ): BigInt {
+    let result = super.call(
+      "calcAlpha",
+      "calcAlpha(uint256,uint256,uint256):(uint256)",
+      [
+        ethereum.Value.fromUnsignedBigInt(_budget),
+        ethereum.Value.fromUnsignedBigInt(_totalVotesSquares),
+        ethereum.Value.fromUnsignedBigInt(_totalSpent)
+      ]
+    );
+
+    return result[0].toBigInt();
+  }
+
+  try_calcAlpha(
+    _budget: BigInt,
+    _totalVotesSquares: BigInt,
+    _totalSpent: BigInt
+  ): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "calcAlpha",
+      "calcAlpha(uint256,uint256,uint256):(uint256)",
+      [
+        ethereum.Value.fromUnsignedBigInt(_budget),
+        ethereum.Value.fromUnsignedBigInt(_totalVotesSquares),
+        ethereum.Value.fromUnsignedBigInt(_totalSpent)
+      ]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   contributorCount(): BigInt {
     let result = super.call(
       "contributorCount",
@@ -162,6 +376,39 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  contributors(param0: Address): FundingRound__contributorsResult {
+    let result = super.call(
+      "contributors",
+      "contributors(address):(uint256,bool)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+
+    return new FundingRound__contributorsResult(
+      result[0].toBigInt(),
+      result[1].toBoolean()
+    );
+  }
+
+  try_contributors(
+    param0: Address
+  ): ethereum.CallResult<FundingRound__contributorsResult> {
+    let result = super.tryCall(
+      "contributors",
+      "contributors(address):(uint256,bool)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new FundingRound__contributorsResult(
+        value[0].toBigInt(),
+        value[1].toBoolean()
+      )
+    );
+  }
+
   coordinator(): Address {
     let result = super.call("coordinator", "coordinator():(address)", []);
 
@@ -235,6 +482,27 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  isAddressZero(addressValue: Address): boolean {
+    let result = super.call("isAddressZero", "isAddressZero(address):(bool)", [
+      ethereum.Value.fromAddress(addressValue)
+    ]);
+
+    return result[0].toBoolean();
+  }
+
+  try_isAddressZero(addressValue: Address): ethereum.CallResult<boolean> {
+    let result = super.tryCall(
+      "isAddressZero",
+      "isAddressZero(address):(bool)",
+      [ethereum.Value.fromAddress(addressValue)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBoolean());
+  }
+
   isCancelled(): boolean {
     let result = super.call("isCancelled", "isCancelled():(bool)", []);
 
@@ -333,6 +601,36 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  poll(): Address {
+    let result = super.call("poll", "poll():(address)", []);
+
+    return result[0].toAddress();
+  }
+
+  try_poll(): ethereum.CallResult<Address> {
+    let result = super.tryCall("poll", "poll():(address)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toAddress());
+  }
+
+  pollId(): BigInt {
+    let result = super.call("pollId", "pollId():(uint256)", []);
+
+    return result[0].toBigInt();
+  }
+
+  try_pollId(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   recipientRegistry(): Address {
     let result = super.call(
       "recipientRegistry",
@@ -356,6 +654,56 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
+  recipients(param0: BigInt): FundingRound__recipientsResult {
+    let result = super.call(
+      "recipients",
+      "recipients(uint256):(bool,bool,uint256)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+
+    return new FundingRound__recipientsResult(
+      result[0].toBoolean(),
+      result[1].toBoolean(),
+      result[2].toBigInt()
+    );
+  }
+
+  try_recipients(
+    param0: BigInt
+  ): ethereum.CallResult<FundingRound__recipientsResult> {
+    let result = super.tryCall(
+      "recipients",
+      "recipients(uint256):(bool,bool,uint256)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new FundingRound__recipientsResult(
+        value[0].toBoolean(),
+        value[1].toBoolean(),
+        value[2].toBigInt()
+      )
+    );
+  }
+
+  tally(): Address {
+    let result = super.call("tally", "tally():(address)", []);
+
+    return result[0].toAddress();
+  }
+
+  try_tally(): ethereum.CallResult<Address> {
+    let result = super.tryCall("tally", "tally():(address)", []);
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toAddress());
+  }
+
   tallyHash(): string {
     let result = super.call("tallyHash", "tallyHash():(string)", []);
 
@@ -371,14 +719,14 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toString());
   }
 
-  poll(): Address {
-    let result = super.call("poll", "poll():(address)", []);
+  topupToken(): Address {
+    let result = super.call("topupToken", "topupToken():(address)", []);
 
     return result[0].toAddress();
   }
 
-  try_poll(): ethereum.CallResult<Address> {
-    let result = super.tryCall("poll", "poll():(address)", []);
+  try_topupToken(): ethereum.CallResult<Address> {
+    let result = super.tryCall("topupToken", "topupToken():(address)", []);
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -386,14 +734,14 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toAddress());
   }
 
-  pollId(): BigInt {
-    let result = super.call("pollId", "pollId():(uint256)", []);
+  totalSpent(): BigInt {
+    let result = super.call("totalSpent", "totalSpent():(uint256)", []);
 
     return result[0].toBigInt();
   }
 
-  try_pollId(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("pollId", "pollId():(uint256)", []);
+  try_totalSpent(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall("totalSpent", "totalSpent():(uint256)", []);
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -401,14 +749,22 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
-  totalSpent(): BigInt {
-    let result = super.call("totalSpent", "totalSpent():(uint256)", []);
+  totalTallyResults(): BigInt {
+    let result = super.call(
+      "totalTallyResults",
+      "totalTallyResults():(uint256)",
+      []
+    );
 
     return result[0].toBigInt();
   }
 
-  try_totalSpent(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("totalSpent", "totalSpent():(uint256)", []);
+  try_totalTallyResults(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "totalTallyResults",
+      "totalTallyResults():(uint256)",
+      []
+    );
     if (result.reverted) {
       return new ethereum.CallResult();
     }
@@ -431,6 +787,29 @@ export class FundingRound extends ethereum.SmartContract {
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
 
+  totalVotesSquares(): BigInt {
+    let result = super.call(
+      "totalVotesSquares",
+      "totalVotesSquares():(uint256)",
+      []
+    );
+
+    return result[0].toBigInt();
+  }
+
+  try_totalVotesSquares(): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "totalVotesSquares",
+      "totalVotesSquares():(uint256)",
+      []
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
   userRegistry(): Address {
     let result = super.call("userRegistry", "userRegistry():(address)", []);
 
@@ -468,6 +847,31 @@ export class FundingRound extends ethereum.SmartContract {
     let value = result.value;
     return ethereum.CallResult.fromValue(value[0].toBigInt());
   }
+
+  withdrawContributions(_contributors: Array<Address>): Array<boolean> {
+    let result = super.call(
+      "withdrawContributions",
+      "withdrawContributions(address[]):(bool[])",
+      [ethereum.Value.fromAddressArray(_contributors)]
+    );
+
+    return result[0].toBooleanArray();
+  }
+
+  try_withdrawContributions(
+    _contributors: Array<Address>
+  ): ethereum.CallResult<Array<boolean>> {
+    let result = super.tryCall(
+      "withdrawContributions",
+      "withdrawContributions(address[]):(bool[])",
+      [ethereum.Value.fromAddressArray(_contributors)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBooleanArray());
+  }
 }
 
 export class ConstructorCall extends ethereum.Call {
@@ -538,6 +942,56 @@ export class CancelCall__Outputs {
   }
 }
 
+export class ClaimFundsCall extends ethereum.Call {
+  get inputs(): ClaimFundsCall__Inputs {
+    return new ClaimFundsCall__Inputs(this);
+  }
+
+  get outputs(): ClaimFundsCall__Outputs {
+    return new ClaimFundsCall__Outputs(this);
+  }
+}
+
+export class ClaimFundsCall__Inputs {
+  _call: ClaimFundsCall;
+
+  constructor(call: ClaimFundsCall) {
+    this._call = call;
+  }
+
+  get _voteOptionIndex(): BigInt {
+    return this._call.inputValues[0].value.toBigInt();
+  }
+
+  get _spent(): BigInt {
+    return this._call.inputValues[1].value.toBigInt();
+  }
+
+  get _spentProof(): Array<Array<BigInt>> {
+    return this._call.inputValues[2].value.toBigIntMatrix();
+  }
+
+  get _spentSalt(): BigInt {
+    return this._call.inputValues[3].value.toBigInt();
+  }
+
+  get _resultsCommitment(): BigInt {
+    return this._call.inputValues[4].value.toBigInt();
+  }
+
+  get _spentVoiceCreditsCommitment(): BigInt {
+    return this._call.inputValues[5].value.toBigInt();
+  }
+}
+
+export class ClaimFundsCall__Outputs {
+  _call: ClaimFundsCall;
+
+  constructor(call: ClaimFundsCall) {
+    this._call = call;
+  }
+}
+
 export class ContributeCall extends ethereum.Call {
   get inputs(): ContributeCall__Inputs {
     return new ContributeCall__Inputs(this);
@@ -608,6 +1062,14 @@ export class FinalizeCall__Inputs {
   get _totalSpentSalt(): BigInt {
     return this._call.inputValues[1].value.toBigInt();
   }
+
+  get _newResultCommitment(): BigInt {
+    return this._call.inputValues[2].value.toBigInt();
+  }
+
+  get _perVOSpentVoiceCreditsHash(): BigInt {
+    return this._call.inputValues[3].value.toBigInt();
+  }
 }
 
 export class FinalizeCall__Outputs {
@@ -708,6 +1170,32 @@ export class RenounceOwnershipCall__Outputs {
   }
 }
 
+export class ResetTallyCall extends ethereum.Call {
+  get inputs(): ResetTallyCall__Inputs {
+    return new ResetTallyCall__Inputs(this);
+  }
+
+  get outputs(): ResetTallyCall__Outputs {
+    return new ResetTallyCall__Outputs(this);
+  }
+}
+
+export class ResetTallyCall__Inputs {
+  _call: ResetTallyCall;
+
+  constructor(call: ResetTallyCall) {
+    this._call = call;
+  }
+}
+
+export class ResetTallyCall__Outputs {
+  _call: ResetTallyCall;
+
+  constructor(call: ResetTallyCall) {
+    this._call = call;
+  }
+}
+
 export class SetMaciCall extends ethereum.Call {
   get inputs(): SetMaciCall__Inputs {
     return new SetMaciCall__Inputs(this);
@@ -728,6 +1216,12 @@ export class SetMaciCall__Inputs {
   get _maci(): Address {
     return this._call.inputValues[0].value.toAddress();
   }
+
+  get _pollContracts(): SetMaciCall_pollContractsStruct {
+    return changetype<SetMaciCall_pollContractsStruct>(
+      this._call.inputValues[1].value.toTuple()
+    );
+  }
 }
 
 export class SetMaciCall__Outputs {
@@ -738,6 +1232,54 @@ export class SetMaciCall__Outputs {
   }
 }
 
+export class SetMaciCall_pollContractsStruct extends ethereum.Tuple {
+  get poll(): Address {
+    return this[0].toAddress();
+  }
+
+  get messageProcessor(): Address {
+    return this[1].toAddress();
+  }
+
+  get tally(): Address {
+    return this[2].toAddress();
+  }
+
+  get subsidy(): Address {
+    return this[3].toAddress();
+  }
+}
+
+export class SetMaciInstanceCall extends ethereum.Call {
+  get inputs(): SetMaciInstanceCall__Inputs {
+    return new SetMaciInstanceCall__Inputs(this);
+  }
+
+  get outputs(): SetMaciInstanceCall__Outputs {
+    return new SetMaciInstanceCall__Outputs(this);
+  }
+}
+
+export class SetMaciInstanceCall__Inputs {
+  _call: SetMaciInstanceCall;
+
+  constructor(call: SetMaciInstanceCall) {
+    this._call = call;
+  }
+
+  get _maci(): Address {
+    return this._call.inputValues[0].value.toAddress();
+  }
+}
+
+export class SetMaciInstanceCall__Outputs {
+  _call: SetMaciInstanceCall;
+
+  constructor(call: SetMaciInstanceCall) {
+    this._call = call;
+  }
+}
+
 export class SubmitMessageBatchCall extends ethereum.Call {
   get inputs(): SubmitMessageBatchCall__Inputs {
     return new SubmitMessageBatchCall__Inputs(this);
@@ -777,7 +1319,7 @@ export class SubmitMessageBatchCall__Outputs {
 }
 
 export class SubmitMessageBatchCall_messagesStruct extends ethereum.Tuple {
-  get iv(): BigInt {
+  get msgType(): BigInt {
     return this[0].toBigInt();
   }
 
@@ -796,6 +1338,40 @@ export class SubmitMessageBatchCall_encPubKeysStruct extends ethereum.Tuple {
   }
 }
 
+export class TopupCall extends ethereum.Call {
+  get inputs(): TopupCall__Inputs {
+    return new TopupCall__Inputs(this);
+  }
+
+  get outputs(): TopupCall__Outputs {
+    return new TopupCall__Outputs(this);
+  }
+}
+
+export class TopupCall__Inputs {
+  _call: TopupCall;
+
+  constructor(call: TopupCall) {
+    this._call = call;
+  }
+
+  get stateIndex(): BigInt {
+    return this._call.inputValues[0].value.toBigInt();
+  }
+
+  get amount(): BigInt {
+    return this._call.inputValues[1].value.toBigInt();
+  }
+}
+
+export class TopupCall__Outputs {
+  _call: TopupCall;
+
+  constructor(call: TopupCall) {
+    this._call = call;
+  }
+}
+
 export class TransferOwnershipCall extends ethereum.Call {
   get inputs(): TransferOwnershipCall__Inputs {
     return new TransferOwnershipCall__Inputs(this);
@@ -842,16 +1418,46 @@ export class WithdrawContributionCall__Inputs {
   constructor(call: WithdrawContributionCall) {
     this._call = call;
   }
+}
+
+export class WithdrawContributionCall__Outputs {
+  _call: WithdrawContributionCall;
+
+  constructor(call: WithdrawContributionCall) {
+    this._call = call;
+  }
+}
+
+export class WithdrawContributionsCall extends ethereum.Call {
+  get inputs(): WithdrawContributionsCall__Inputs {
+    return new WithdrawContributionsCall__Inputs(this);
+  }
+
+  get outputs(): WithdrawContributionsCall__Outputs {
+    return new WithdrawContributionsCall__Outputs(this);
+  }
+}
+
+export class WithdrawContributionsCall__Inputs {
+  _call: WithdrawContributionsCall;
+
+  constructor(call: WithdrawContributionsCall) {
+    this._call = call;
+  }
 
   get _contributors(): Array<Address> {
     return this._call.inputValues[0].value.toAddressArray();
   }
 }
 
-export class WithdrawContributionCall__Outputs {
-  _call: WithdrawContributionCall;
+export class WithdrawContributionsCall__Outputs {
+  _call: WithdrawContributionsCall;
 
-  constructor(call: WithdrawContributionCall) {
+  constructor(call: WithdrawContributionsCall) {
     this._call = call;
   }
+
+  get result(): Array<boolean> {
+    return this._call.outputValues[0].value.toBooleanArray();
+  }
 }
diff --git a/subgraph/schema.graphql b/subgraph/schema.graphql
index 3465701bb..557be3f86 100644
--- a/subgraph/schema.graphql
+++ b/subgraph/schema.graphql
@@ -172,6 +172,7 @@ type Contribution @entity {
   voiceCredits: BigInt
 
   createdAt: String
+  lastUpdatedAt: String
 }
 
 type Vote @entity {
diff --git a/subgraph/src/FundingRoundMapping.ts b/subgraph/src/FundingRoundMapping.ts
index 6cd951ed2..765cbd59b 100644
--- a/subgraph/src/FundingRoundMapping.ts
+++ b/subgraph/src/FundingRoundMapping.ts
@@ -1,4 +1,4 @@
-import { BigInt, log, store } from '@graphprotocol/graph-ts'
+import { BigInt, log, store, ethereum } from '@graphprotocol/graph-ts'
 import {
   Contribution,
   ContributionWithdrawn,
@@ -7,6 +7,7 @@ import {
   TallyPublished,
   RegisterCall,
   Voted,
+  Topup,
   FundingRound as FundingRoundContract,
 } from '../generated/templates/FundingRound/FundingRound'
 import { OptimisticRecipientRegistry as RecipientRegistryContract } from '../generated/templates/FundingRound/OptimisticRecipientRegistry'
@@ -135,6 +136,7 @@ export function handleContributionWithdrawn(
     BigInt.fromI32(1)
   )
   fundingRound.lastUpdatedAt = timestamp
+  fundingRound.save()
 }
 
 export function handleFundsClaimed(event: FundsClaimed): void {
@@ -223,3 +225,25 @@ export function handleVoted(event: Voted): void {
   }
   vote.save()
 }
+
+export function handleTopup(event: Topup): void {
+  log.info('handleTopup', [])
+  let timestamp = event.block.timestamp.toString()
+  let fundingRoundId = event.address.toHexString()
+  let fundingRoundContract = FundingRoundContract.bind(event.address)
+  let contributorAddress = event.params._sender
+  let contributorId = contributorAddress.toHexString()
+  let contributionId = fundingRoundId
+    .concat('-contribution-')
+    .concat(contributorId)
+  let contribution = new FundingRoundContribution(contributionId)
+  let contributor = fundingRoundContract.contributors(event.params._sender)
+  contribution.amount = contributor.getAmount()
+  let data = ethereum.encode(ethereum.Value.fromAddress(event.params._sender))!
+  contribution.voiceCredits = fundingRoundContract.getVoiceCredits(
+    event.params._sender,
+    data
+  )
+  contribution.lastUpdatedAt = timestamp
+  contribution.save()
+}
diff --git a/subgraph/subgraph.template.yaml b/subgraph/subgraph.template.yaml
index 1b8bf245b..c0b98a9d0 100644
--- a/subgraph/subgraph.template.yaml
+++ b/subgraph/subgraph.template.yaml
@@ -118,6 +118,8 @@ templates:
           handler: handleTallyPublished
         - event: Voted(indexed address)
           handler: handleVoted
+        - event: Topup(indexed address,uint256)
+          handler: handleTopup
       file: ./src/FundingRoundMapping.ts
   - name: OptimisticRecipientRegistry
     kind: ethereum/contract
diff --git a/subgraph/subgraph.yaml b/subgraph/subgraph.yaml
index 0a5b17677..5eaf6e54e 100644
--- a/subgraph/subgraph.yaml
+++ b/subgraph/subgraph.yaml
@@ -118,6 +118,8 @@ templates:
           handler: handleTallyPublished
         - event: Voted(indexed address)
           handler: handleVoted
+        - event: Topup(indexed address,uint256)
+          handler: handleTopup
       file: ./src/FundingRoundMapping.ts
   - name: OptimisticRecipientRegistry
     kind: ethereum/contract
diff --git a/vue-app/src/components/Cart.vue b/vue-app/src/components/Cart.vue
index 08f77b294..9b4254818 100644
--- a/vue-app/src/components/Cart.vue
+++ b/vue-app/src/components/Cart.vue
@@ -21,7 +21,6 @@
     <div v-else class="cart-container">
       <div class="reallocation-message" v-if="canUserReallocate && hasUserVoted">
         {{ $t('cart.div1') }}
-        <links to="/about/maci" class="message-link"> {{ $t('cart.link1') }}</links>
       </div>
       <div class="reallocation-message" v-if="canUserReallocate && !hasUserVoted">
         {{ $t('cart.div2') }}
@@ -99,10 +98,10 @@
           <span>{{ $t('cart.span1') }}</span>
           {{ formatAmount(contribution) }} {{ tokenSymbol }}
         </div>
-        <div :class="isGreaterThanInitialContribution() ? 'reallocation-row-warning' : 'reallocation-row'">
+        <div class="reallocation-row">
           <span>{{ $t('cart.span2') }}</span>
           <div class="reallocation-warning">
-            <span v-if="isGreaterThanInitialContribution()">⚠️</span>{{ formatAmount(getCartTotal(cart)) }}
+            {{ formatAmount(getCartTotal(cart)) }}
             {{ tokenSymbol }}
           </div>
         </div>
@@ -116,11 +115,7 @@
           + {{ formatAmount(contribution - getTotal()) }}
           {{ tokenSymbol }}
         </div>
-        <div
-          @click="splitContributionsEvenly"
-          class="split-link"
-          v-if="isGreaterThanInitialContribution() || hasUnallocatedFunds()"
-        >
+        <div @click="splitContributionsEvenly" class="split-link" v-if="hasUnallocatedFunds()">
           <img src="@/assets/split.svg" />
           {{
             $t('cart.div10', {
@@ -213,11 +208,7 @@
       <div class="total-bar" v-if="isRoundContributionPhase || (hasUserContributed && hasContributionPhaseEnded)">
         <span class="total-label">{{ $t('cart.span5') }}</span>
         <div>
-          <span v-if="isGreaterThanInitialContribution() && hasUserContributed"
-            >{{ formatAmount(getCartTotal(cart)) }} /
-            <span class="total-reallocation">{{ formatAmount(contribution) }}</span>
-          </span>
-          <span v-else>{{ formatAmount(getTotal()) }}</span>
+          <span>{{ formatAmount(getCartTotal(cart)) }}</span>
           {{ tokenSymbol }}
         </div>
       </div>
@@ -443,6 +434,7 @@ function isFormValid(): boolean {
 }
 
 function getCartMatchingPoolTotal(): string {
+  console.log('contribution.value', contribution.value, getCartTotal(committedCart.value))
   return formatAmount(contribution.value - getCartTotal(committedCart.value))
 }
 
@@ -460,7 +452,7 @@ function getCartTotal(cart: Array<CartItem>): bigint {
 }
 
 function getTotal(): bigint {
-  return hasUserContributed.value ? contribution.value : getCartTotal(cart.value)
+  return getCartTotal(cart.value)
 }
 
 function isGreaterThanMax(): boolean {
@@ -536,11 +528,6 @@ const errorMessage = computed<string | null>(() => {
       // Reallocating funds
       if (!contributor.value) {
         return t('dynamic.cart.error.contributor_key_missing')
-      } else if (isGreaterThanInitialContribution()) {
-        return t('dynamic.cart.error.more_than_original_contribution', {
-          total: formatAmount(contribution.value),
-          tokenSymbol: tokenSymbol.value,
-        })
       } else {
         return null
       }
@@ -554,10 +541,10 @@ function hasUnallocatedFunds(): boolean {
 
 const votes = computed(() => {
   const { nativeTokenDecimals, voiceCreditFactor } = currentRound.value!
-  const formattedVotes: [number, bigint][] = cart.value.map((item: CartItem) => {
+  const formattedVotes: [number, bigint, bigint][] = cart.value.map((item: CartItem) => {
     const amount = parseUnits(item.amount, nativeTokenDecimals)
     const voiceCredits = amount / voiceCreditFactor
-    return [item.index, voiceCredits]
+    return [item.index, voiceCredits, amount]
   })
   return formattedVotes
 })
@@ -587,6 +574,7 @@ function submitCart(event: any) {
   const { open: openReallocationModal, close: closeReallocationModal } = useModal({
     component: ReallocationModal,
     attrs: {
+      contribution: contribution.value,
       votes: votes.value,
       onClose() {
         appStore.restoreCommittedCartToLocalCart()
diff --git a/vue-app/src/components/ContributionModal.vue b/vue-app/src/components/ContributionModal.vue
index c1ee702fb..2a6b45cb2 100644
--- a/vue-app/src/components/ContributionModal.vue
+++ b/vue-app/src/components/ContributionModal.vue
@@ -121,7 +121,7 @@
 
 <script setup lang="ts">
 import { onMounted, ref, computed } from 'vue'
-import { BaseContract, Contract, toNumber } from 'ethers'
+import { Contract, toNumber } from 'ethers'
 import { Keypair, PubKey, Message, createMessage } from '@clrfund/common'
 
 import Transaction from '@/components/Transaction.vue'
@@ -144,7 +144,7 @@ const { currentUser } = storeToRefs(userStore)
 const emit = defineEmits(['close'])
 
 interface Props {
-  votes: [number, bigint][]
+  votes: [number, bigint, bigint][]
 }
 
 const props = defineProps<Props>()
@@ -224,9 +224,8 @@ async function getFundingRoundContract() {
 }
 
 const total = computed(() => {
-  const { voiceCreditFactor } = currentRound.value!
-  return props.votes.reduce((total: bigint, [, voiceCredits]) => {
-    return total + voiceCredits * voiceCreditFactor
+  return props.votes.reduce((total: bigint, [, , amount]) => {
+    return total + amount
   }, BigInt(0))
 })
 
@@ -238,7 +237,7 @@ const renderTotal = computed(() => {
 async function contribute() {
   try {
     step.value += 1
-    const { nativeTokenAddress, voiceCreditFactor, maciAddress, fundingRoundAddress } = currentRound.value!
+    const { nativeTokenAddress, maciAddress, fundingRoundAddress } = currentRound.value!
     const signer = await userStore.getSigner()
     const signerAddess = await signer.getAddress()
     const token = new Contract(nativeTokenAddress, ERC20, signer)
diff --git a/vue-app/src/components/ReallocationModal.vue b/vue-app/src/components/ReallocationModal.vue
index 0caa26368..90a8a94f0 100644
--- a/vue-app/src/components/ReallocationModal.vue
+++ b/vue-app/src/components/ReallocationModal.vue
@@ -1,12 +1,92 @@
 <template>
   <vue-final-modal class="modal-container" background="interactive">
     <div class="modal-body">
-      <div v-if="step === 1">
-        <h3>{{ $t('reallocationModal.h3') }}</h3>
+      <div v-if="step === 0">
+        <h3>
+          {{ $t('reallocationModal.confirm') }}
+        </h3>
+        <p>
+          {{
+            $t('reallocationModal.confirm_details', {
+              renderAmount,
+              nativeTokenSymbol: currentRound?.nativeTokenSymbol,
+            })
+          }}
+        </p>
+        <div class="btn-row">
+          <button class="btn-secondary" @click="$emit('close')">
+            {{ $t('reallocationModal.btn_cancel') }}
+          </button>
+          <button class="btn-primary" @click="topup()">
+            {{ $t('reallocationModal.btn_continue') }}
+          </button>
+        </div>
+      </div>
+      <div v-else-if="step === 1">
+        <progress-bar :currentStep="1" :totalSteps="3" />
+        <h3>
+          {{
+            $t('reallocationModal.approve', {
+              renderAmount,
+              nativeTokenSymbol: currentRound?.nativeTokenSymbol,
+            })
+          }}
+        </h3>
+        <p>
+          {{
+            $t('reallocationModal.permission', {
+              renderAmount,
+              nativeTokenSymbol: currentRound?.nativeTokenSymbol,
+            })
+          }}
+        </p>
         <transaction
-          :hash="voteTxHash"
-          :error="voteTxError"
+          :hash="approvalTxHash"
+          :error="approvalTxError || error"
+          @close="$emit('close')"
+          @retry="
+            () => {
+              step = 0
+              approvalTxError = ''
+              topup()
+            }
+          "
+          :displayRetryBtn="true"
+        ></transaction>
+      </div>
+      <div v-else-if="step === 2">
+        <progress-bar :currentStep="2" :totalSteps="3" />
+        <h3>{{ $t('reallocationModal.increase') }}</h3>
+        <p>
+          {{
+            $t('reallocationModal.increase_details', {
+              nativeTokenSymbol: currentRound?.nativeTokenSymbol,
+            })
+          }}
+        </p>
+        <transaction
+          :hash="topupTxHash"
+          :error="topupTxError || error"
           @close="emit('close')"
+          @retry="
+            () => {
+              topupTxError = ''
+              topup()
+            }
+          "
+          :displayRetryBtn="true"
+        ></transaction>
+      </div>
+      <div v-if="step === 3">
+        <progress-bar :currentStep="3" :totalSteps="3" />
+        <h2>{{ $t('reallocationModal.reallocate') }}</h2>
+        <p>
+          {{ $t('reallocationModal.reallocate_details') }}
+        </p>
+        <transaction
+          :hash="voteTxHash"
+          :error="voteTxError || error"
+          @close="$emit('close')"
           @retry="
             () => {
               voteTxError = ''
@@ -21,19 +101,21 @@
 </template>
 
 <script lang="ts" setup>
-import { Contract } from 'ethers'
+import { Contract, type Signer } from 'ethers'
 import type { PubKey, Message } from '@clrfund/common'
 import Transaction from '@/components/Transaction.vue'
 import { waitForTransaction } from '@/utils/contracts'
 import { createMessage } from '@clrfund/common'
 import { VueFinalModal } from 'vue-final-modal'
 
-import { FundingRound } from '@/api/abi'
+import { ERC20, FundingRound } from '@/api/abi'
 import { useAppStore, useUserStore } from '@/stores'
 import { useRouter } from 'vue-router'
+import { formatAmount } from '@/utils/amounts'
 
 interface Props {
-  votes: [number, bigint][]
+  contribution: bigint
+  votes: [number, bigint, bigint][]
 }
 
 const props = defineProps<Props>()
@@ -42,20 +124,98 @@ const emit = defineEmits(['close'])
 const router = useRouter()
 const appStore = useAppStore()
 const userStore = useUserStore()
+const { currentRound } = storeToRefs(appStore)
 
-const step = ref(1)
+const step = ref(0)
 const voteTxHash = ref('')
 const voteTxError = ref('')
+const topupTxHash = ref('')
+const topupTxError = ref('')
+const approvalTxHash = ref('')
+const approvalTxError = ref('')
+const error = ref('')
 
-onMounted(() => {
-  vote()
+const totalInVotes = computed(() => {
+  return props.votes.reduce((total, [, , amount]) => {
+    return total + amount
+  }, BigInt(0))
+})
+
+const topupAmount = computed(() => {
+  return props.contribution < totalInVotes.value ? totalInVotes.value - props.contribution : BigInt(0)
+})
+
+const renderAmount = computed(() => {
+  const { nativeTokenDecimals } = currentRound.value!
+  return formatAmount(topupAmount.value, nativeTokenDecimals)
 })
 
+onMounted(async () => {
+  if (topupAmount.value > BigInt(0)) {
+    step.value = 0
+  } else {
+    step.value = 2
+    vote()
+  }
+})
+
+const total = computed(() => {
+  return props.votes.reduce((total: bigint, [, , amount]) => {
+    return total + amount
+  }, BigInt(0))
+})
+
+async function topup() {
+  step.value += 1
+  const contributor = appStore.contributor
+  const { fundingRoundAddress, nativeTokenAddress } = appStore.currentRound!
+
+  let signer: Signer
+  try {
+    signer = await userStore.getSigner()
+  } catch (err) {
+    error.value = 'Error getting signer. ' + (err as Error).message
+    return
+  }
+
+  try {
+    const signerAddress = await signer.getAddress()
+    const token = new Contract(nativeTokenAddress, ERC20, signer)
+    const allowance = await token.allowance(signerAddress, fundingRoundAddress)
+    if (allowance < topupAmount.value) {
+      await waitForTransaction(
+        token.approve(fundingRoundAddress, topupAmount.value),
+        hash => (approvalTxHash.value = hash),
+      )
+    }
+  } catch (err) {
+    approvalTxError.value = (err as Error).message
+    return
+  }
+  step.value += 1
+
+  try {
+    const fundingRound = new Contract(fundingRoundAddress, FundingRound, signer)
+    await waitForTransaction(
+      fundingRound.topup(contributor!.stateIndex, topupAmount.value),
+      hash => (topupTxHash.value = hash),
+    )
+  } catch (err) {
+    topupTxError.value = 'Error adding more contribution ' + (err as Error).message
+    return
+  }
+
+  appStore.saveCommittedCart()
+  appStore.setContribution(total.value)
+  // Reload contribution pool size
+  appStore.loadRoundInfo()
+  step.value += 1
+  vote()
+}
+
 async function vote() {
   const contributor = appStore.contributor
   const { coordinatorPubKey, fundingRoundAddress, pollId } = appStore.currentRound!
-  const signer = await userStore.getSigner()
-  const fundingRound = new Contract(fundingRoundAddress, FundingRound, signer)
   const messages: Message[] = []
   const encPubKeys: PubKey[] = []
   let nonce = 1
@@ -75,6 +235,8 @@ async function vote() {
     nonce += 1
   }
   try {
+    const signer = await userStore.getSigner()
+    const fundingRound = new Contract(fundingRoundAddress, FundingRound, signer)
     await waitForTransaction(
       fundingRound.submitMessageBatch(
         messages.reverse().map(msg => msg.asContractParam()),
@@ -105,4 +267,17 @@ async function vote() {
 .close-btn {
   margin-top: $modal-space;
 }
+
+.btn-row {
+  display: flex;
+  margin: 1rem 0;
+  margin-top: 1.5rem;
+  align-items: center;
+  justify-content: space-between;
+  gap: 1rem;
+
+  .btn {
+    margin: 0 $modal-space;
+  }
+}
 </style>
diff --git a/vue-app/src/graphql/API.ts b/vue-app/src/graphql/API.ts
index 96cdd297e..e7c8e638e 100644
--- a/vue-app/src/graphql/API.ts
+++ b/vue-app/src/graphql/API.ts
@@ -31,7 +31,6 @@ export type Block_Height = {
 
 export type ClrFund = {
   __typename?: 'ClrFund';
-  batchUstVerifier: Maybe<Scalars['Bytes']>;
   contributorRegistry: Maybe<ContributorRegistry>;
   contributorRegistryAddress: Maybe<Scalars['Bytes']>;
   coordinator: Maybe<Scalars['Bytes']>;
@@ -50,14 +49,11 @@ export type ClrFund = {
   nativeToken: Maybe<Scalars['Bytes']>;
   nativeTokenInfo: Maybe<Token>;
   owner: Maybe<Scalars['Bytes']>;
-  qvtVerifier: Maybe<Scalars['Bytes']>;
   recipientRegistry: Maybe<RecipientRegistry>;
   recipientRegistryAddress: Maybe<Scalars['Bytes']>;
-  signUpDuration: Maybe<Scalars['BigInt']>;
   stateTreeDepth: Maybe<Scalars['BigInt']>;
   tallyBatchSize: Maybe<Scalars['BigInt']>;
   voteOptionTreeDepth: Maybe<Scalars['BigInt']>;
-  votingDuration: Maybe<Scalars['BigInt']>;
 };
 
 
@@ -73,16 +69,6 @@ export type ClrFund_Filter = {
   /** Filter for the block changed event. */
   _change_block: InputMaybe<BlockChangedFilter>;
   and: InputMaybe<Array<InputMaybe<ClrFund_Filter>>>;
-  batchUstVerifier: InputMaybe<Scalars['Bytes']>;
-  batchUstVerifier_contains: InputMaybe<Scalars['Bytes']>;
-  batchUstVerifier_gt: InputMaybe<Scalars['Bytes']>;
-  batchUstVerifier_gte: InputMaybe<Scalars['Bytes']>;
-  batchUstVerifier_in: InputMaybe<Array<Scalars['Bytes']>>;
-  batchUstVerifier_lt: InputMaybe<Scalars['Bytes']>;
-  batchUstVerifier_lte: InputMaybe<Scalars['Bytes']>;
-  batchUstVerifier_not: InputMaybe<Scalars['Bytes']>;
-  batchUstVerifier_not_contains: InputMaybe<Scalars['Bytes']>;
-  batchUstVerifier_not_in: InputMaybe<Array<Scalars['Bytes']>>;
   contributorRegistry: InputMaybe<Scalars['String']>;
   contributorRegistryAddress: InputMaybe<Scalars['Bytes']>;
   contributorRegistryAddress_contains: InputMaybe<Scalars['Bytes']>;
@@ -306,16 +292,6 @@ export type ClrFund_Filter = {
   owner_not: InputMaybe<Scalars['Bytes']>;
   owner_not_contains: InputMaybe<Scalars['Bytes']>;
   owner_not_in: InputMaybe<Array<Scalars['Bytes']>>;
-  qvtVerifier: InputMaybe<Scalars['Bytes']>;
-  qvtVerifier_contains: InputMaybe<Scalars['Bytes']>;
-  qvtVerifier_gt: InputMaybe<Scalars['Bytes']>;
-  qvtVerifier_gte: InputMaybe<Scalars['Bytes']>;
-  qvtVerifier_in: InputMaybe<Array<Scalars['Bytes']>>;
-  qvtVerifier_lt: InputMaybe<Scalars['Bytes']>;
-  qvtVerifier_lte: InputMaybe<Scalars['Bytes']>;
-  qvtVerifier_not: InputMaybe<Scalars['Bytes']>;
-  qvtVerifier_not_contains: InputMaybe<Scalars['Bytes']>;
-  qvtVerifier_not_in: InputMaybe<Array<Scalars['Bytes']>>;
   recipientRegistry: InputMaybe<Scalars['String']>;
   recipientRegistryAddress: InputMaybe<Scalars['Bytes']>;
   recipientRegistryAddress_contains: InputMaybe<Scalars['Bytes']>;
@@ -347,14 +323,6 @@ export type ClrFund_Filter = {
   recipientRegistry_not_starts_with_nocase: InputMaybe<Scalars['String']>;
   recipientRegistry_starts_with: InputMaybe<Scalars['String']>;
   recipientRegistry_starts_with_nocase: InputMaybe<Scalars['String']>;
-  signUpDuration: InputMaybe<Scalars['BigInt']>;
-  signUpDuration_gt: InputMaybe<Scalars['BigInt']>;
-  signUpDuration_gte: InputMaybe<Scalars['BigInt']>;
-  signUpDuration_in: InputMaybe<Array<Scalars['BigInt']>>;
-  signUpDuration_lt: InputMaybe<Scalars['BigInt']>;
-  signUpDuration_lte: InputMaybe<Scalars['BigInt']>;
-  signUpDuration_not: InputMaybe<Scalars['BigInt']>;
-  signUpDuration_not_in: InputMaybe<Array<Scalars['BigInt']>>;
   stateTreeDepth: InputMaybe<Scalars['BigInt']>;
   stateTreeDepth_gt: InputMaybe<Scalars['BigInt']>;
   stateTreeDepth_gte: InputMaybe<Scalars['BigInt']>;
@@ -379,18 +347,9 @@ export type ClrFund_Filter = {
   voteOptionTreeDepth_lte: InputMaybe<Scalars['BigInt']>;
   voteOptionTreeDepth_not: InputMaybe<Scalars['BigInt']>;
   voteOptionTreeDepth_not_in: InputMaybe<Array<Scalars['BigInt']>>;
-  votingDuration: InputMaybe<Scalars['BigInt']>;
-  votingDuration_gt: InputMaybe<Scalars['BigInt']>;
-  votingDuration_gte: InputMaybe<Scalars['BigInt']>;
-  votingDuration_in: InputMaybe<Array<Scalars['BigInt']>>;
-  votingDuration_lt: InputMaybe<Scalars['BigInt']>;
-  votingDuration_lte: InputMaybe<Scalars['BigInt']>;
-  votingDuration_not: InputMaybe<Scalars['BigInt']>;
-  votingDuration_not_in: InputMaybe<Array<Scalars['BigInt']>>;
 };
 
 export enum ClrFund_OrderBy {
-  BatchUstVerifier = 'batchUstVerifier',
   ContributorRegistry = 'contributorRegistry',
   ContributorRegistryAddress = 'contributorRegistryAddress',
   ContributorRegistryContext = 'contributorRegistry__context',
@@ -447,7 +406,6 @@ export enum ClrFund_OrderBy {
   NativeTokenInfoSymbol = 'nativeTokenInfo__symbol',
   NativeTokenInfoTokenAddress = 'nativeTokenInfo__tokenAddress',
   Owner = 'owner',
-  QvtVerifier = 'qvtVerifier',
   RecipientRegistry = 'recipientRegistry',
   RecipientRegistryAddress = 'recipientRegistryAddress',
   RecipientRegistryBaseDeposit = 'recipientRegistry__baseDeposit',
@@ -458,11 +416,9 @@ export enum ClrFund_OrderBy {
   RecipientRegistryLastUpdatedAt = 'recipientRegistry__lastUpdatedAt',
   RecipientRegistryMaxRecipients = 'recipientRegistry__maxRecipients',
   RecipientRegistryOwner = 'recipientRegistry__owner',
-  SignUpDuration = 'signUpDuration',
   StateTreeDepth = 'stateTreeDepth',
   TallyBatchSize = 'tallyBatchSize',
-  VoteOptionTreeDepth = 'voteOptionTreeDepth',
-  VotingDuration = 'votingDuration'
+  VoteOptionTreeDepth = 'voteOptionTreeDepth'
 }
 
 export type Contribution = {
@@ -778,7 +734,6 @@ export type ContributorRegistry_Filter = {
 
 export enum ContributorRegistry_OrderBy {
   ClrFund = 'clrFund',
-  ClrFundBatchUstVerifier = 'clrFund__batchUstVerifier',
   ClrFundContributorRegistryAddress = 'clrFund__contributorRegistryAddress',
   ClrFundCoordinator = 'clrFund__coordinator',
   ClrFundCoordinatorPubKey = 'clrFund__coordinatorPubKey',
@@ -793,13 +748,10 @@ export enum ContributorRegistry_OrderBy {
   ClrFundMessageTreeDepth = 'clrFund__messageTreeDepth',
   ClrFundNativeToken = 'clrFund__nativeToken',
   ClrFundOwner = 'clrFund__owner',
-  ClrFundQvtVerifier = 'clrFund__qvtVerifier',
   ClrFundRecipientRegistryAddress = 'clrFund__recipientRegistryAddress',
-  ClrFundSignUpDuration = 'clrFund__signUpDuration',
   ClrFundStateTreeDepth = 'clrFund__stateTreeDepth',
   ClrFundTallyBatchSize = 'clrFund__tallyBatchSize',
   ClrFundVoteOptionTreeDepth = 'clrFund__voteOptionTreeDepth',
-  ClrFundVotingDuration = 'clrFund__votingDuration',
   Context = 'context',
   Contributors = 'contributors',
   CreatedAt = 'createdAt',
@@ -1597,7 +1549,6 @@ export type FundingRound_Filter = {
 
 export enum FundingRound_OrderBy {
   ClrFund = 'clrFund',
-  ClrFundBatchUstVerifier = 'clrFund__batchUstVerifier',
   ClrFundContributorRegistryAddress = 'clrFund__contributorRegistryAddress',
   ClrFundCoordinator = 'clrFund__coordinator',
   ClrFundCoordinatorPubKey = 'clrFund__coordinatorPubKey',
@@ -1612,13 +1563,10 @@ export enum FundingRound_OrderBy {
   ClrFundMessageTreeDepth = 'clrFund__messageTreeDepth',
   ClrFundNativeToken = 'clrFund__nativeToken',
   ClrFundOwner = 'clrFund__owner',
-  ClrFundQvtVerifier = 'clrFund__qvtVerifier',
   ClrFundRecipientRegistryAddress = 'clrFund__recipientRegistryAddress',
-  ClrFundSignUpDuration = 'clrFund__signUpDuration',
   ClrFundStateTreeDepth = 'clrFund__stateTreeDepth',
   ClrFundTallyBatchSize = 'clrFund__tallyBatchSize',
   ClrFundVoteOptionTreeDepth = 'clrFund__voteOptionTreeDepth',
-  ClrFundVotingDuration = 'clrFund__votingDuration',
   Contributions = 'contributions',
   ContributorCount = 'contributorCount',
   ContributorRegistry = 'contributorRegistry',
@@ -2430,7 +2378,6 @@ export enum RecipientRegistry_OrderBy {
   BaseDeposit = 'baseDeposit',
   ChallengePeriodDuration = 'challengePeriodDuration',
   ClrFund = 'clrFund',
-  ClrFundBatchUstVerifier = 'clrFund__batchUstVerifier',
   ClrFundContributorRegistryAddress = 'clrFund__contributorRegistryAddress',
   ClrFundCoordinator = 'clrFund__coordinator',
   ClrFundCoordinatorPubKey = 'clrFund__coordinatorPubKey',
@@ -2445,13 +2392,10 @@ export enum RecipientRegistry_OrderBy {
   ClrFundMessageTreeDepth = 'clrFund__messageTreeDepth',
   ClrFundNativeToken = 'clrFund__nativeToken',
   ClrFundOwner = 'clrFund__owner',
-  ClrFundQvtVerifier = 'clrFund__qvtVerifier',
   ClrFundRecipientRegistryAddress = 'clrFund__recipientRegistryAddress',
-  ClrFundSignUpDuration = 'clrFund__signUpDuration',
   ClrFundStateTreeDepth = 'clrFund__stateTreeDepth',
   ClrFundTallyBatchSize = 'clrFund__tallyBatchSize',
   ClrFundVoteOptionTreeDepth = 'clrFund__voteOptionTreeDepth',
-  ClrFundVotingDuration = 'clrFund__votingDuration',
   Controller = 'controller',
   CreatedAt = 'createdAt',
   Id = 'id',
@@ -3416,7 +3360,7 @@ export const GetContributorIndexDocument = gql`
 export const GetContributorMessagesDocument = gql`
     query GetContributorMessages($fundingRoundAddress: String!, $pubKey: String!, $contributorAddress: Bytes!) {
   messages(
-    where: {fundingRound: $fundingRoundAddress, publicKey: $pubKey, submittedBy: $contributorAddress}
+    where: {fundingRound: $fundingRoundAddress, publicKey: $pubKey, submittedBy: $contributorAddress, msgType: "1"}
     first: 1000
     orderBy: blockNumber
     orderDirection: desc
diff --git a/vue-app/src/locales/cn.json b/vue-app/src/locales/cn.json
index 693ba2260..08504849f 100644
--- a/vue-app/src/locales/cn.json
+++ b/vue-app/src/locales/cn.json
@@ -177,7 +177,7 @@
     },
     "reallocation": {
       "title": "调整阶段",
-      "paragraph": "在这个阶段，如果你已经捐赠了，你将有时间改变主意。你可以编辑你的捐赠金额或添加/删除项目，但你的总捐赠额必须等于你原来的捐赠额。",
+      "paragraph": "在这个阶段，如果你已经捐赠了，你将有时间改变主意。你可以编辑你的捐赠金额或添加/删除项目。",
       "need": {
         "title": "了解事项",
         "li-1": " 在捐赠阶段结束后，这个阶段将持续 {reallocationPhaseDays} 天。",
@@ -871,7 +871,7 @@
     "connect": "连接",
     "sign_the_message_to_see_your_cart": "请签个字以查看您的捐款车",
     "h3_1": "连接查看您的捐款车",
-    "div1": "您已经贡献过了。您可以更改您的选择并添加新的项目，但是您原本的总捐额必需一样。",
+    "div1": "您已经贡献过了。您可以更改您的选择并添加新的项目。",
     "link1": "为什么?",
     "div2": "几乎完成了！您必须再提交一笔交易才能完成您的贡献。",
     "h2_1": "编辑捐款车",
@@ -1021,7 +1021,16 @@
     "h2_4": "团队: "
   },
   "reallocationModal": {
-    "h3": "重新分配捐款"
+    "confirm": "提升您的影响力吗？",
+    "confirm_details": "您的购物车总额已超过您的原来贡献金额。您是否想增加{renderTopup} {nativeTokenSymbol}到您的总捐款金额？",
+    "btn_cancel": "取消",
+    "btn_continue": "继续",
+    "approve": "批准 {renderTotal} {nativeTokenSymbol}",
+    "permission": " 这会让这个 APP 有权从您的钱包中提取 {renderTotal} {nativeTokenSymbol} 作为您的贡献。",
+    "increase": "增加捐款",
+    "increase_details": "此交易将使您的贡献增加 {renderAmount} {nativeTokenSymbol}。",
+    "reallocate": "重新分配捐款",
+    "reallocate_details": "此交易将重新分配您的捐款到您喜爱的项目。"
   },
   "recipientSubmissionWidget": {
     "div1": "等待交易被挖掘...",
@@ -1190,8 +1199,7 @@
         "not_enough_funds": "资金不足. 您的余额是 {balance} {nativeTokenSymbol}.",
         "too_generous": "您的贡献太大了。最大贡献为 {maxAmount} {nativeTokenSymbol}.",
         "need_gas_payment": "您需要一些 ETH 来支付交易费",
-        "contributor_key_missing": "找不到贡献者密钥。请刷新并重试，并确保您使用的浏览器/机器与您进行贡献的浏览器/机器相同。",
-        "more_than_original_contribution": "您的新总额不能超过您原本的 {total} {tokenSymbol} 贡献."
+        "contributor_key_missing": "找不到贡献者密钥。请刷新并重试，并确保您使用的浏览器/机器与您进行贡献的浏览器/机器相同。"
       },
       "action": {
         "remove_all": "全部删除",
diff --git a/vue-app/src/locales/en.json b/vue-app/src/locales/en.json
index 89dd5781e..a6cf05de0 100644
--- a/vue-app/src/locales/en.json
+++ b/vue-app/src/locales/en.json
@@ -177,7 +177,7 @@
     },
     "reallocation": {
       "title": "Reallocation phase",
-      "paragraph": "During this phase, if you've contributed, you will have time to change   your mind. You can edit your contribution amounts or add/remove projects   but your total must equal that of your original contribution.",
+      "paragraph": "During this phase, if you've contributed, you will have time to change your mind. You can edit your contribution amounts or add/remove projects.",
       "need": {
         "title": "Need to know",
         "li-1": " This phase will last {reallocationPhaseDays} days after the end of the contribution phase.",
@@ -871,7 +871,7 @@
     "connect": "Connect",
     "sign_the_message_to_see_your_cart": "Please sign the message to see your cart",
     "h3_1": "Connect to see your cart",
-    "div1": "You’ve already contributed this round. You can edit your choices and add new projects, but your cart total must always equal your original contribution amount.",
+    "div1": "You’ve already contributed this round. You can edit your choices and add new projects.",
     "link1": "Why?",
     "div2": "Almost done! You must submit one more transaction to complete your contribution.",
     "h2_1": "Edit cart",
@@ -929,9 +929,9 @@
     "btn_cancel": "Cancel",
     "btn_continue": "Continue",
     "approve": "Approve {renderTotal} {nativeTokenSymbol}",
-    "permission": " This gives this app permission to withdraw {renderTotal} {nativeTokenSymbol} from your wallet for your contribution.",
-    "send_contribution": " Send {renderTotal} {nativeTokenSymbol} contribution",
-    "send_tx": " This transaction sends out your {renderTotal} {nativeTokenSymbol} contribution to your chosen projects.",
+    "permission": "This gives this app permission to withdraw {renderTotal} {nativeTokenSymbol} from your wallet for your contribution.",
+    "send_contribution": "Send {renderTotal} {nativeTokenSymbol} contribution",
+    "send_tx": "This transaction sends out your {renderTotal} {nativeTokenSymbol} contribution to your chosen projects.",
     "magic": "Matching pool magic ✨",
     "how_much": "This transaction lets the matching pool know how much {nativeTokenSymbol} to send to your favorite projects based on your contributions."
   },
@@ -1021,7 +1021,16 @@
     "h2_4": "Team: "
   },
   "reallocationModal": {
-    "h3": "Reallocate funds"
+    "confirm": "Boost your impact?",
+    "confirm_details": "Your cart total has exceeded your original contribution amount. Would you like to increase your contribution by {renderTopup} {nativeTokenSymbol}?",
+    "btn_cancel": "Cancel",
+    "btn_continue": "Continue",
+    "approve": "Approve {renderAmount} {nativeTokenSymbol}",
+    "permission": " This gives this app permission to withdraw {renderAmount} {nativeTokenSymbol} from your wallet for your additional contribution.",
+    "increase": " Increase contribution",
+    "increase_details": " This transaction will increase your contribution by {renderAmount} {nativeTokenSymbol}.",
+    "reallocate": "Reallocate funds",
+    "reallocate_details": "This transaction reallocates your contribution to your favorite projects."
   },
   "recipientSubmissionWidget": {
     "div1": "Waiting for transaction to be mined...",
@@ -1190,8 +1199,7 @@
         "not_enough_funds": "Not enough funds. Your balance is {balance} {nativeTokenSymbol}.",
         "too_generous": "Your contribution is too generous. The max contribution is {maxAmount} {nativeTokenSymbol}.",
         "need_gas_payment": "You need some ETH to pay for gas",
-        "contributor_key_missing": "Contributor key is not found. Refresh and try again and/or make sure you're using the same browser/machine as the one you contributed with.",
-        "more_than_original_contribution": "Your new total can't be more than your original {total} {tokenSymbol} contribution"
+        "contributor_key_missing": "Contributor key is not found. Refresh and try again and/or make sure you're using the same browser/machine as the one you contributed with."
       },
       "action": {
         "remove_all": "Remove all",
diff --git a/vue-app/src/locales/es.json b/vue-app/src/locales/es.json
index 54b0f04dc..6a27bd940 100644
--- a/vue-app/src/locales/es.json
+++ b/vue-app/src/locales/es.json
@@ -177,7 +177,7 @@
     },
     "reallocation": {
       "title": "Fase de reasignación",
-      "paragraph": "Durante esta fase, si has contribuido, tendrás tiempo para cambiar de opinión. Puedes editar los montos de tu contribución o agregar/eliminar proyectos, pero el total debe ser igual al de tu contribución original.",
+      "paragraph": "Durante esta fase, si has contribuido, tendrás tiempo para cambiar de opinión. Puedes editar los montos de tu contribución o agregar/eliminar proyectos.",
       "need": {
         "title": "Necesitas saber",
         "li-1": "Esta fase durará {reallocationPhaseDays} días después del final de la fase de contribución.",
@@ -871,7 +871,7 @@
     "connect": "Conéctate",
     "sign_the_message_to_see_your_cart": "Por favor, firmar el mesaje para ver tu carrito",
     "h3_1": "Conéctate para ver tu carrito",
-    "div1": "Ya has contribuido en esta ronda. Puedes editar tus elecciones y agregar nuevos proyectos, pero el total de tu carrito siempre debe ser igual a la cantidad original de tu contribución.",
+    "div1": "Ya has contribuido en esta ronda. Puedes editar tus elecciones y agregar nuevos proyectos.",
     "link1": "¿Por qué?",
     "div2": "¡Casi terminas! Debes enviar una transacción más para completar tu contribución.",
     "h2_1": "Editar carrito",
@@ -1021,7 +1021,16 @@
     "h2_4": "Equipo: "
   },
   "reallocationModal": {
-    "h3": "Reasignar fondos"
+    "confirm": "¿Potenciar tu impacto?",
+    "confirm_details": "El total de su carrito ha superado el monto original de su contribución. ¿Le gustaría aumentar su contribución en {renderTopup} {nativeTokenSymbol}?",
+    "btn_cancel": "Cancelar",
+    "btn_continue": "Continuar",
+    "approve": "Aprobar {renderTotal} {nativeTokenSymbol}",
+    "permission": "Esto le otorga a esta aplicación el permiso para retirar {renderTotal} {nativeTokenSymbol} de tu billetera para tu contribución.",
+    "increase": "Aumentar la contribución",
+    "increase_details": "Esta transacción aumentará su contribución en {renderAmount} {nativeTokenSymbol}.",
+    "reallocate": "Reasignar fondos",
+    "reallocate_details": "Esta transacción reubica tu contribución a tus proyectos favoritos."
   },
   "recipientSubmissionWidget": {
     "div1": "Esperando que se mine la transacción...",
@@ -1190,8 +1199,7 @@
         "not_enough_funds": "Fondos insuficientes. Tu saldo es de {balance} {nativeTokenSymbol}.",
         "too_generous": "Tu contribución es demasiado generosa. La contribución máxima es de {maxAmount} {nativeTokenSymbol}.",
         "need_gas_payment": "Necesitas tener ETH para pagar por el gas.",
-        "contributor_key_missing": "No se encontró la clave del colaborador. Actualiza la página e intenta de nuevo y/o asegúrate de estar utilizando el mismo navegador/máquina con la que hiciste la contribución.",
-        "more_than_original_contribution": "Tu nuevo total no puede ser mayor que tu contribución original de {total} {tokenSymbol}"
+        "contributor_key_missing": "No se encontró la clave del colaborador. Actualiza la página e intenta de nuevo y/o asegúrate de estar utilizando el mismo navegador/máquina con la que hiciste la contribución."
       },
       "action": {
         "remove_all": "Eliminar todo",