more changes for add/edit and delete