begin fix of add/delete