AFAIK

(1) still 30K ang tax free.
(2) above 30K ang may tax. in your example, 20K lang ang taxable.