test and update new db structure
database redesigned