big changes new database stru ture