re-did db schema