updated to new schema