More changes to Calculator