updated calculator: