DB works with new instractions

not fully tested yet