Tax law changes

To make sure I understand properly, if we file married, filing jointly, and we profited $40,000, we would be taxed at 0%? Or, once added to our other taxable income, and the total would be,say, 85,000, would everything be taxed at the 15%?