done part of editing