Updated Problem, Solver and main