Fixing the new DB