changed loading to match new schema