db and .gitmodules changes