Improves the generator version of the solution