using new db schema