further work on the editor level