some more work on DB;