Adding arc calculations as well.