Updated with correct tax calculation