Completed EditorHandler ---