More work on the editor