mid-change of database structure
further work on new DB model