model and generator improved