Duplicate the better delete / add functionality