added changes to enable deletion & update