Donald Trump rewrites tax plan