removed extraneoues generator wrapper