fixed diag, diag1, consolidated both with others