Updates for simulation and time calculation