beta+ version, fixed database issue