Same as before, may be it's better to return the generator?