Almost + Updated DB