Changes for delete and edit