Added diagonal computation of A matrix.