done with calc, testing needed