added better tax calc