Updated generator
Merge