Updated Calculator