final version of EditorCOntroller