Added Enscapsulated Calc.