diff --git a/contracts/mocks/Disposables/DisposableAssessment.sol b/contracts/mocks/Disposables/DisposableAssessment.sol
index f94a1c6e06..a3410350ef 100644
--- a/contracts/mocks/Disposables/DisposableAssessment.sol
+++ b/contracts/mocks/Disposables/DisposableAssessment.sol
@@ -2,11 +2,11 @@
 
 pragma solidity ^0.8.9;
 
+import "../../interfaces/ITokenController.sol";
 import "../../interfaces/IAssessment.sol";
 import "../../abstract/MasterAwareV2.sol";
 
 contract DisposableAssessment is MasterAwareV2 {
-
   /* ========== STATE VARIABLES ========== */
 
   IAssessment.Configuration public config;
@@ -23,12 +23,15 @@ contract DisposableAssessment is MasterAwareV2 {
 
   /* ========== CONSTRUCTOR ========== */
 
-  function initialize (address masterAddress) external {
+  function initialize(address masterAddress, address payable _tokenControllerAddress) external {
     config.minVotingPeriodInDays = 3; // days
     config.payoutCooldownInDays = 1; //days
     master = INXMMaster(masterAddress);
+
+    // to receive nxm
+    internalContracts[uint(ID.TC)] = _tokenControllerAddress;
+    ITokenController(_tokenControllerAddress).addToWhitelist(address(this));
   }
 
   function changeDependentContractAddress() external override {}
-
 }
diff --git a/scripts/deploy/deploy.js b/scripts/deploy/deploy.js
index a70bddebf4..0b3e31cac3 100644
--- a/scripts/deploy/deploy.js
+++ b/scripts/deploy/deploy.js
@@ -187,7 +187,7 @@ async function main() {
   console.log('Deploying assessment contracts');
   const yt = await deployProxy('YieldTokenIncidents', [tk.address, coverNFT.address]);
   const ic = await deployProxy('IndividualClaims', [tk.address, coverNFT.address]);
-  const assessment = await deployProxy('Assessment', [tk.address]);
+  const assessment = await deployProxy('DisposableAssessment', []);
 
   console.log('Deploying SwapOperator');
   const cowVaultRelayer = await deployImmutable('SOMockVaultRelayer');
@@ -289,10 +289,12 @@ async function main() {
     ...proxyContractCodes.map(() => '2'), // proxy
   ];
 
-  console.log('Initialazing contracts');
+  console.log('Initializing contracts');
   await master.initialize(owner, tk.address, owner, codes, types, addresses);
   await tc.initialize(master.address, tk.address, ps.address, assessment.address);
 
+  await assessment.initialize(master.address, tc.address);
+
   await mr.initialize(
     owner,
     master.address,
@@ -385,6 +387,7 @@ async function main() {
   await upgradeProxy(gw.address, 'LegacyGateway');
   await upgradeProxy(ps.address, 'LegacyPooledStaking', [cover.address, productsV1.address]);
   await upgradeProxy(master.address, 'NXMaster');
+  await upgradeProxy(assessment.address, 'Assessment', [tk.address]);
 
   console.log('Deploying CoverViewer');
   await deployImmutable('CoverViewer', [master.address]);