Editor rework part 1