fix DB - not yet finish