updated context_editor #371