timestep and timewindow are not just related to aggregation, put back
where they was