DB work fine

note: still we need to update all the values