o Edge cases with new database