Updates to Calculator