small changes in solver and new e.g.