Final editor changes