Fixing t_elapsed and d_elapsed