Few adjustements to the new generator.