Ways and Means completes new tax plan