Solver solving but still doesn't work quite well