final db version

didn't include test data