diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 8bd19c58e..d760c4825 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -227,7 +227,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
                 return eval->Invalid("mismatched origpubkeys for fillbuy");
             else
             {
-                inputs = 0;
+                /*inputs = 0;
                 for (i=2; i<numvins; i++)
                 {
                     if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
@@ -237,18 +237,16 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
                             fprintf(stderr,"i.%d starti.%d numvins.%d\n",i,starti,numvins);
                             return eval->Invalid("always should find vin, but didnt");
                         }
-                        else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
+                        else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 && ConstrainVout(vinTx.vout[tx.vin[i].prevout.n],1,CCaddr,0) != 0 )
                         {
                             fprintf(stderr,"vin%d %llu, ",i,(long long)assetoshis);
                             inputs += assetoshis;
                         }
                     }
-                }
-                if ( inputs == 0 )
-                    return eval->Invalid("vout2 is normal for fillbuy");
-                else if ( ConstrainVout(tx.vout[1],0,0,0) == 0 )
+                }*/
+                if ( ConstrainVout(tx.vout[1],0,0,0) == 0 )
                     return eval->Invalid("vout1 is CC for fillbuy");
-                else if ( ValidateBidRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,inputs,totalunits) == false )
+                else if ( ValidateBidRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
                     return eval->Invalid("mismatched remainder for fillbuy");
                 else if ( remaining_price != 0 )
                 {
@@ -306,7 +304,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
                 return eval->Invalid("mismatched origpubkeys for fill");
             else
             {
-                inputs = 0;
+                /*inputs = 0;
                 for (i=2; i<numvins; i++)
                 {
                     if ( (*cp->ismyvin)(tx.vin[i].scriptSig) == 0 )
@@ -318,8 +316,8 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
                         }
                         inputs += vinTx.vout[tx.vin[i].prevout.n].nValue;
                     }
-                }
-                if ( ValidateAskRemainder(remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[1].nValue,inputs,totalunits) == false )
+                }*/
+                if ( ValidateAskRemainder(remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
                     return eval->Invalid("mismatched remainder for fill");
                 else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
                     return eval->Invalid("normal vout1 for fillask");
@@ -356,24 +354,8 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             else
             {
                 inputs = 0;
-                for (i=2; i<numvins; i++)
-                {
-                    if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
-                    {
-                        if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
-                        {
-                            fprintf(stderr,"i.%d starti.%d numvins.%d\n",i,starti,numvins);
-                            return eval->Invalid("always should find vin, but didnt");
-                        }
-                        else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
-                        {
-                            fprintf(stderr,"vin%d %llu, ",i,(long long)assetoshis);
-                            inputs += assetoshis;
-                        }
-                    }
-                }
                 fprintf(stderr,"assets vout0 %llu, vin1 %llu, vout2 %llu -> orig, vout1 %llu, total %llu\n",(long long)tx.vout[0].nValue,(long long)assetoshis,(long long)tx.vout[2].nValue,(long long)tx.vout[1].nValue,(long long)totalunits);
-                if ( ValidateSwapRemainder(remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[1].nValue,inputs,totalunits) == false )
+                if ( ValidateSwapRemainder(remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
                     return eval->Invalid("mismatched remainder for fill");
                 else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
                     return eval->Invalid("normal vout1 for fillask");