refactoring; db ver;