some generator changes