For #24: Spec changes.