modify for spec change