modified solvers and stuff