Working on new generate
Updating new generation