Integrated new editor
Missed files