slight generator changes