Added the delete function
Merge changes