Upgrading our Calculator