Further update to Editor.....