Updated Generate