updated for new schema