before pulling Kain's changes
Added in editor changes