updates and deletions according to Dave