updated for editor