Spec updates from Adam Bishop