changed to Calculator
more changes for calculator functions