I was thinking the version number of the data format, not the version number of FF. However, keeping the version number of FF is a good idea too.

Yeah, agreed on the not storing p2.