Redone the generation

Redone the generation