working new db stucture