Some changes with Psi_A_matrix