much better progressive tax calculation