More Progress on Generator