Delete Function + New Feature