got rid of diag system solver