Update for doGenerate()