updated generator and first draft output
updated generator and first draft output