updated for schema change