Latest  Updates to the calculator