More generator work