diff --git a/contracts/mainnet/connectors/compound-iii/helpers.sol b/contracts/mainnet/connectors/compound-iii/helpers.sol
index 5bffaaff..d71a3cc7 100644
--- a/contracts/mainnet/connectors/compound-iii/helpers.sol
+++ b/contracts/mainnet/connectors/compound-iii/helpers.sol
@@ -83,6 +83,9 @@ abstract contract Helpers is DSMath, Basic {
 			params.market,
 			_token
 		);
+
+		_amt = _amt == uint256(-1) ? initialBal : _amt;
+
 		_withdraw(params.market, _token, params.from, params.to, _amt);
 
 		uint256 finalBal = getAccountSupplyBalanceOfAsset(
diff --git a/contracts/mainnet/connectors/compound-iii/main.sol b/contracts/mainnet/connectors/compound-iii/main.sol
index 77678190..2b57652e 100644
--- a/contracts/mainnet/connectors/compound-iii/main.sol
+++ b/contracts/mainnet/connectors/compound-iii/main.sol
@@ -12,7 +12,6 @@ import { Stores } from "../../common/stores.sol";
 import { Helpers } from "./helpers.sol";
 import { Events } from "./events.sol";
 import { CometInterface } from "./interface.sol";
-import "hardhat/console.sol";
 
 abstract contract CompoundIIIResolver is Events, Helpers {
 	/**
@@ -47,11 +46,15 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 		TokenInterface tokenContract = TokenInterface(_token);
 
 		if (isEth) {
+			_amt = _amt == uint256(-1) ? address(this).balance : _amt;
 			convertEthToWeth(isEth, tokenContract, _amt);
+		} else {
+			_amt = _amt == uint256(-1)
+				? tokenContract.balanceOf(address(this))
+				: _amt;
+			approve(tokenContract, market, _amt);
 		}
 
-		approve(tokenContract, market, _amt);
-
 		CometInterface(market).supply(_token, _amt);
 
 		setUint(setId, _amt);
@@ -94,11 +97,15 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 		TokenInterface tokenContract = TokenInterface(_token);
 
 		if (isEth) {
+			_amt = _amt == uint256(-1) ? address(this).balance : _amt;
 			convertEthToWeth(isEth, tokenContract, _amt);
+		} else {
+			_amt = _amt == uint256(-1)
+				? tokenContract.balanceOf(address(this))
+				: _amt;
+			approve(tokenContract, market, _amt);
 		}
 
-		approve(tokenContract, market, _amt);
-
 		CometInterface(market).supplyTo(to, _token, _amt);
 
 		setUint(setId, _amt);
@@ -143,11 +150,15 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 		TokenInterface tokenContract = TokenInterface(_token);
 
 		if (isEth) {
+			_amt = _amt == uint256(-1) ? address(this).balance : _amt;
 			convertEthToWeth(isEth, tokenContract, _amt);
+		} else {
+			_amt = _amt == uint256(-1)
+				? tokenContract.balanceOf(address(this))
+				: _amt;
+			approve(tokenContract, market, _amt);
 		}
 
-		approve(tokenContract, market, _amt);
-
 		CometInterface(market).supplyFrom(from, to, _token, _amt);
 
 		setUint(setId, _amt);
@@ -194,6 +205,8 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 			token
 		);
 
+		_amt = _amt == uint256(-1) ? initialBal : _amt;
+
 		CometInterface(market).withdraw(_token, _amt);
 
 		uint256 finalBal = getAccountSupplyBalanceOfAsset(
@@ -315,7 +328,6 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 		address token = getBaseToken(market);
 		bool isEth = token == ethAddr;
 		address _token = isEth ? wethAddr : token;
-		console.log(_amt);
 
 		TokenInterface tokenContract = TokenInterface(_token);
 
@@ -324,6 +336,9 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 			market,
 			_token
 		);
+
+		_amt = _amt == uint256(-1) ? initialBal : _amt;
+
 		CometInterface(market).withdraw(_token, _amt);
 
 		uint256 finalBal = getAccountSupplyBalanceOfAsset(
@@ -432,8 +447,8 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 		address _token = isEth ? wethAddr : token;
 		TokenInterface tokenContract = TokenInterface(_token);
 
-		approve(tokenContract, market, uint256(-1));
 		uint256 _amt = CometInterface(market).borrowBalanceOf(address(this));
+		approve(tokenContract, market, _amt);
 
 		CometInterface(market).supply(_token, uint256(-1));
 
@@ -466,8 +481,8 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 		address _token = isEth ? wethAddr : token;
 		TokenInterface tokenContract = TokenInterface(_token);
 
-		approve(tokenContract, market, uint256(-1));
 		uint256 _amt = CometInterface(market).borrowBalanceOf(to);
+		approve(tokenContract, market, _amt);
 
 		CometInterface(market).supplyTo(to, _token, uint256(-1));
 
@@ -502,8 +517,8 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 		address _token = isEth ? wethAddr : token;
 		TokenInterface tokenContract = TokenInterface(_token);
 
-		approve(tokenContract, market, uint256(-1));
 		uint256 _amt = CometInterface(market).borrowBalanceOf(to);
+		approve(tokenContract, market, _amt);
 
 		CometInterface(market).supplyFrom(from, to, _token, uint256(-1));
 
@@ -670,6 +685,9 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 			convertEthToWeth(isEth, tokenContract, _amt);
 		}
 
+		_amt = _amt == uint256(-1)
+			? CometInterface(market).balanceOf(address(this))
+			: _amt;
 		_transfer(market, _token, address(0), dest, _amt);
 
 		setUint(setId, _amt);
@@ -712,6 +730,9 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 			convertEthToWeth(isEth, tokenContract, _amt);
 		}
 
+		_amt = _amt == uint256(-1)
+			? CometInterface(market).balanceOf(src)
+			: _amt;
 		_transfer(market, _token, src, dest, _amt);
 
 		setUint(setId, _amt);
@@ -756,6 +777,9 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 			convertEthToWeth(isEth, tokenContract, _amt);
 		}
 
+		_amt = _amt == uint256(-1)
+			? CometInterface(market).userCollateral(address(this), _token).balance
+			: _amt;
 		_transfer(market, _token, address(0), dest, _amt);
 
 		setUint(setId, _amt);
@@ -800,6 +824,9 @@ abstract contract CompoundIIIResolver is Events, Helpers {
 			convertEthToWeth(isEth, tokenContract, _amt);
 		}
 
+		_amt = _amt == uint256(-1)
+			? CometInterface(market).userCollateral(src, _token).balance
+			: _amt;
 		_transfer(market, _token, src, dest, _amt);
 
 		setUint(setId, _amt);