Major revisions to vary + data file