Bunch of work on generator