Hooked up correct tax calculation