Editor rework started