Updated generator
Fixed Generator