Merge new generator 1