Tweaked add and added part 1 of edit.