Further work on editor