improve deleting, adding