Timestamps need to be in the data file too