updated calculator