Updated to reflect changes in MatrixCalculator