Completed the solver and tracer