wip for the new generator