Ok, Solver changed again, and it should be ready for testing