updated to have delete notification ability
updated with merge