diff --git a/dao/remappings.txt b/dao/remappings.txt
index 36bcdca..d5c7da1 100644
--- a/dao/remappings.txt
+++ b/dao/remappings.txt
@@ -1,4 +1,5 @@
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
 @openzeppelin/=lib/openzeppelin-contracts/
-@superfluid-finance/=lib/superfluid-protocol-monorepo/
+@superfluid-finance/=lib/superfluid-protocol-monorepo/packages
+@custom-supertokens/=custom-supertokens/
diff --git a/dao/src/SuperfluidDaoToken.sol b/dao/src/SuperfluidDaoToken.sol
index a8fa7e9..151b581 100644
--- a/dao/src/SuperfluidDaoToken.sol
+++ b/dao/src/SuperfluidDaoToken.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPLv3
 pragma solidity ^0.8.0;
 
-import {SuperTokenBase} from "../custom-supertokens/contracts/base/SuperTokenBase.sol";
+import {SuperTokenBase} from "@custom-supertokens/contracts/base/SuperTokenBase.sol";
 
-address constant SUPER_TOKEN_FACTORY = 0x0422689cc4087b6B7280e0a7e7F655200ec86Ae1;
+address constant SUPER_TOKEN_FACTORY = 0x94f26B4c8AD12B18c12f38E878618f7664bdcCE2;
 
 contract SuperfluidAdmin {
     address private _admin;
@@ -22,17 +22,18 @@ contract SuperfluidAdmin {
     }
 }
 
-contract SuperfluidDaoToken is  SuperfluidAdmin {
+contract SuperfluidDaoToken is SuperTokenBase, SuperfluidAdmin {
 
     constructor() {
-		_initialize(SUPER_TOKEN_FACTORY, "SuperfluidDaoToken", "SDT");
+        
+	    // _initialize(SUPER_TOKEN_FACTORY, "SuperfluidDaoToken", "SDT");
     }
 
 	function mint(address to, uint256 amount) public onlyAdmin {
-        _mint(to, amount);
+        _mint(to, amount, "");
     }
 
     function burn(address to, uint256 amount) public onlyAdmin {
-        _burn(to, amount);
+        _burn(to, amount, "");
     }
 }
diff --git a/dao/test/SuperfluidDao.t.sol b/dao/test/SuperfluidDao.t.sol
index fb1d90c..9930b78 100644
--- a/dao/test/SuperfluidDao.t.sol
+++ b/dao/test/SuperfluidDao.t.sol
@@ -113,7 +113,7 @@ contract SuperfluidDaoTest is Test {
         Dao.postProposal("Donnez moins d'argent a Isma", 1);
         Dao.vote(0, true);
         ISuperfluidDao.Proposal memory proposal = Dao.getProposal(0);
-        vm.warp(proposal.dueDate + 1);    
+        vm.warp(proposal.dueDate + 1);
         Dao.executeProposal(0);
         vm.stopPrank();
     }