Modified solver-core