Changed calculator-problem to simple inheritance