fixed generation and editing