Spec re-arrange