Modify for new spec.