Sales Tax rebooted with more classes