generators are reset
added better editor support