Slight change to spec wording, rearranged, more formats