Move up time loop to prevent delays due to calc on data