Extended to allow multiple methods of calc.