fix the data processing and timing