updated to most recent db schema