have to fix db-structure