updated to comply with new schema