Update to use data time not system time to file the data