Changed calc.cpp