UPDATED calculator version