added class Calculator