Added class Calc