Another attempt to put the data in Yose's expected format.