updated generator and first draft output