Updated DB working version