Slightly change solver class