changes for fix delete/add/edit functionality