updated generators