Change calculator and comments