Another format change, updated spec accordingly