Worked on AddEdit