Finished edit-in-place part I