Adding some work on the generators