Improved Calc example