Thesis: Generator done