Spec changes

Possible future work?: