more generator changes