moved generator-related stuff